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 9717 by niro, Thu Jan 5 21:45:16 2012 UTC revision 9720 by niro, Fri Jan 6 00:32:47 2012 UTC
    # Line 20  JRE_DEPEND=">= dev-java/java-environment Line 20  JRE_DEPEND=">= dev-java/java-environment
    20   >= x11-libs/libXrender-0.9   >= x11-libs/libXrender-0.9
    21   >= media-libs/libjpeg-8   >= media-libs/libjpeg-8
    22   >= media-libs/libpng-1.5   >= media-libs/libpng-1.5
    23   >= media-libs/giflib-4.1"   >= media-libs/giflib-4.1
    24     >= net-print/libcups-1.5"
    25    
    26  # eclipse-ecj-3.7.x has build issues with openjdk6  # eclipse-ecj-3.7.x has build issues with openjdk6
    27  SDEPEND="${JRE_DEPEND}  SDEPEND="${JRE_DEPEND}
    # Line 195  src_install_openjdk-jre() Line 196  src_install_openjdk-jre()
    196   mclearconfig || die   mclearconfig || die
    197   maddconfig "JAVA_HOME=\"${JAVA_DIR}\"" || die   maddconfig "JAVA_HOME=\"${JAVA_DIR}\"" || die
    198   maddconfig "JRE_HOME=\"${JAVA_DIR}\"" || die   maddconfig "JRE_HOME=\"${JAVA_DIR}\"" || die
    199     maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/resources.jar" || die
    200   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/rt.jar\"" || die   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/rt.jar\"" || die
    201  # maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/i18n.jar\"" || die  # maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/i18n.jar\"" || die
    202   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/sunrsasign.jar\"" || die   maddconfig "CLASSPATH=\"${JAVA_DIR}/jre/lib/sunrsasign.jar\"" || die
    # Line 291  src_install_openjdk-demos() Line 293  src_install_openjdk-demos()
    293   minstalldir ${JAVA_DIR} || die   minstalldir ${JAVA_DIR} || die
    294   mcopy -R openjdk.build/j2sdk-image/demo ${JAVA_DIR}/ || die   mcopy -R openjdk.build/j2sdk-image/demo ${JAVA_DIR}/ || die
    295   mcopy -R openjdk.build/j2sdk-image/sample ${JAVA_DIR}/ || die   mcopy -R openjdk.build/j2sdk-image/sample ${JAVA_DIR}/ || die
    296     minstalldir ${JAVA_DIR}/sample/rmi || die
    297   minstallexec openjdk.build/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die   minstallexec openjdk.build/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die
    298   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    299  }  }
    Legend:
    Removed from v.9717  
    changed lines
      Added in v.9720