1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

. 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
This commit is contained in:
Greg Lewis 2003-08-31 22:43:08 +00:00
parent ba7efc0e0d
commit 95a95a767e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=88226
2 changed files with 8 additions and 4 deletions

View File

@ -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}

View File

@ -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