Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

    Diff of /branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 9726 by niro, Fri Jan 6 00:32:47 2012 UTC revision 9727 by niro, Fri Jan 6 11:14:26 2012 UTC
    # Line 78  SRC_URI=( Line 78  SRC_URI=(
    78   mirror://${PNAME}/${PNAME}-${PVER}-hardcoded-test-cmds.patch   mirror://${PNAME}/${PNAME}-${PVER}-hardcoded-test-cmds.patch
    79   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch
    80   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch
    81     mirror://${PNAME}/${PNAME}-${PVER}-build-fix.patch
    82  )  )
    83    
    84  UP2DATE="updatecmd 'http://icedtea.classpath.org/download/source/?C=M;O=A' | grep icedtea6-[0-9] | lasttarball gz | sed 's:\(.*\):6.\1:'"  UP2DATE="updatecmd 'http://icedtea.classpath.org/download/source/?C=M;O=A' | grep icedtea6-[0-9] | lasttarball gz | sed 's:\(.*\):6.\1:'"
    # Line 118  src_prepare() Line 119  src_prepare()
    119    
    120   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die
    121   install -d ${ICEDTEA_SRCDIR}/drops || die   install -d ${ICEDTEA_SRCDIR}/drops || die
    122   cp ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    123   cp ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    124   cp ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   ln -snf ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    125   mautoreconf || die   mautoreconf || die
    126  }  }
    127    
    # Line 158  src_compile() Line 159  src_compile()
    159    
    160   # apply our patches here   # apply our patches here
    161   cd ${ICEDTEA_SRCDIR}/openjdk   cd ${ICEDTEA_SRCDIR}/openjdk
    162    
    163     # some of our progs are in /bin not /usr/bin (head, test, gawk)
    164   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die
    165    
    166     # fixes hardcoded test /usr/bin/test > /bin/test
    167   mpatch ${PNAME}-${PVER}-hardcoded-test-cmds.patch || die   mpatch ${PNAME}-${PVER}-hardcoded-test-cmds.patch || die
    168    
    169     # support non parenting wms via JAVA_AWT_WM_NONREPARENTING env-var
    170   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die
    171    
    172     # fix fontconfig pathes
    173   mpatch ${PNAME}-${PVER}-fontconfig.patch || die   mpatch ${PNAME}-${PVER}-fontconfig.patch || die
      cd ${ICEDTEA_SRCDIR}  
    174    
    175     # fix build against gcj/ecj-javac with -Werror enabled
    176     # upstream from jdk8: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/75d763111eec
    177     mpatch ${PNAME}-${PVER}-build-fix.patch || die
    178    
    179     cd ${ICEDTEA_SRCDIR}
    180   mmake || die   mmake || die
    181  }  }
    182    
    Legend:
    Removed from v.9726  
    changed lines
      Added in v.9727