diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2003-08-31 22:43:08 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2003-08-31 22:43:08 +0000 |
| commit | 95a95a767e3dfd395f4c51602b4a7978a93372a5 (patch) | |
| tree | a4daabfaa75f985c4b77240eee6f80688e66d2d0 /java | |
| parent | New port: audio/eTktab - guitar tabulature editor (diff) | |
. 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
Notes
Notes:
svn path=/head/; revision=88226
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 |