diff options
| author | glewis <glewis@FreeBSD.org> | 2003-09-01 06:43:08 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2003-09-01 06:43:08 +0800 |
| commit | 304bd99b4f87fdedc3b66146114d1214c62c0e78 (patch) | |
| tree | 5660c35d8d02b565c4ba2f584c7640a1fefa0add /java | |
| parent | 379d26bbcc37c64093d26df99b28411d56fade3d (diff) | |
| download | freebsd-ports-gnome-304bd99b4f87fdedc3b66146114d1214c62c0e78.tar.gz freebsd-ports-gnome-304bd99b4f87fdedc3b66146114d1214c62c0e78.tar.zst freebsd-ports-gnome-304bd99b4f87fdedc3b66146114d1214c62c0e78.zip | |
. Remove native_threads directories when native threads are not specified
during the compile. The native threads java_vm binaries are compiled
regardless of the settings and were causing problems with the packing
list.
. Fix packing list so that native_threads versions of java_vm are
conditionalised.
PR: 56007
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk13/Makefile | 4 | ||||
| -rw-r--r-- | java/jdk13/pkg-plist | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 6210efa1c69a..5951ed77d68b 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -280,6 +280,10 @@ do-install: ${MKDIR} ${PREFIX}/share/doc/java post-install: +.if !defined(WITH_NATIVE_THREADS) && !defined(WITH_HOTSPOT) + ${RM} -rf ${PREFIX}/jdk${JDK_VERSION}/bin/i386/native_threads + ${RM} -rf ${PREFIX}/jdk${JDK_VERSION}/jre/bin/i386/native_threads +.endif @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" .if !defined(WITHOUT_PLUGIN) @${ECHO_MSG} diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist index 9387be021319..1eb3b34e9faf 100644 --- a/java/jdk13/pkg-plist +++ b/java/jdk13/pkg-plist @@ -70,8 +70,8 @@ jdk%%JDK_VERSION%%/bin/i386/green_threads/tnameserv %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/jarsigner_g %%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_g -%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm -%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g +%%NATIVE:%%%%PLUGIN:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm +%%NATIVE:%%%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/java_vm_g %%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javac_g %%NATIVE:%%jdk%%JDK_VERSION%%/bin/i386/native_threads/javadoc @@ -752,8 +752,8 @@ jdk%%JDK_VERSION%%/jre/bin/i386/green_threads/tnameserv %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/jarsigner_g %%NATIVE:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_g -%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm -%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g +%%NATIVE:%%%%PLUGIN:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm +%%NATIVE:%%%%PLUGIN:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/java_vm_g %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javac_g %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javadoc_g %%NATIVE:%%%%DEBUG:%%jdk%%JDK_VERSION%%/jre/bin/i386/native_threads/javah_g |