diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index 84fd13185..a04ce485c 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -43,8 +43,47 @@ CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702" REVISION="1" ARCHITECTURES="x86 !x86_gcc2" +DISABLE_SOURCE_PACKAGE=yes + # at least as long as Ant and a complete SDK image are part of the sources + PROVIDES=" openjdk = $portVersion compat >= 1 + cmd:apt = $portVersion compat >= 1 + cmd:extcheck = $portVersion compat >= 1 + cmd:idlj = $portVersion compat >= 1 + cmd:jar = $portVersion compat >= 1 + cmd:jarsigner = $portVersion compat >= 1 + cmd:java = $portVersion compat >= 1 + cmd:javac = $portVersion compat >= 1 + cmd:javadoc = $portVersion compat >= 1 + cmd:javah = $portVersion compat >= 1 + cmd:javap = $portVersion compat >= 1 + cmd:jconsole = $portVersion compat >= 1 + cmd:jdb = $portVersion compat >= 1 + cmd:jhat = $portVersion compat >= 1 + cmd:jinfo = $portVersion compat >= 1 + cmd:jmap = $portVersion compat >= 1 + cmd:jps = $portVersion compat >= 1 + cmd:jrunscript = $portVersion compat >= 1 + cmd:jsadebugd = $portVersion compat >= 1 + cmd:jstack = $portVersion compat >= 1 + cmd:jstat = $portVersion compat >= 1 + cmd:jstatd = $portVersion compat >= 1 + cmd:keytool = $portVersion compat >= 1 + cmd:native2ascii = $portVersion compat >= 1 + cmd:orbd = $portVersion compat >= 1 + cmd:pack200 = $portVersion compat >= 1 + cmd:rmic = $portVersion compat >= 1 + cmd:rmid = $portVersion compat >= 1 + cmd:rmiregistry = $portVersion compat >= 1 + cmd:schemagen = $portVersion compat >= 1 + cmd:serialver = $portVersion compat >= 1 + cmd:servertool = $portVersion compat >= 1 + cmd:tnameserv = $portVersion compat >= 1 + cmd:unpack200 = $portVersion compat >= 1 + cmd:wsgen = $portVersion compat >= 1 + cmd:wsimport = $portVersion compat >= 1 + cmd:xjc = $portVersion compat >= 1 " REQUIRES=" @@ -136,16 +175,14 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR INSTALL() { -exit 1 - # install - mkdir -p `finddir B_COMMON_DIRECTORY`/jdk - cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk - # setup env - $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh + # install the generated SDK image dir + cd .. + jdkDir=$libDir/openjdk + mkdir -p $(dirname $jdkDir) + cp -a output/j2sdk-image $jdkDir - # build distro - mkdir -p ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk - cp -r -f -v output/j2sdk-image/* ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install + # symlink the executables to binDir + mkdir -p $binDir + symlinkRelative -s $jdkDir/bin/* $binDir + # TODO: We should probably link only a subset. }