diff options
| author | glewis <glewis@FreeBSD.org> | 2003-10-08 08:45:01 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2003-10-08 08:45:01 +0800 |
| commit | ab95a6feb7d6977948f5d5ddd34bea8dd7ca7ba6 (patch) | |
| tree | 8563759d537e6ae9d498599e0bef9e80c241a67d | |
| parent | cdd564aafe7b89688d778a5b3fc226ff7c8815cb (diff) | |
| download | freebsd-ports-graphics-ab95a6feb7d6977948f5d5ddd34bea8dd7ca7ba6.tar.gz freebsd-ports-graphics-ab95a6feb7d6977948f5d5ddd34bea8dd7ca7ba6.tar.zst freebsd-ports-graphics-ab95a6feb7d6977948f5d5ddd34bea8dd7ca7ba6.zip | |
. Use ${PTHREAD_LIBS} rather than -pthread.
Suggested by: mi
| -rw-r--r-- | java/jdk13/Makefile | 18 | ||||
| -rw-r--r-- | java/jdk13/files/patch-vm.make | 13 |
2 files changed, 30 insertions, 1 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 5951ed77d68..002bae749fa 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -85,6 +85,7 @@ PLIST_SUB+= DEBUG:="" .if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) PLIST_SUB+= NATIVE:="" MAKE_ARGS+= HPIS="green native" +USE_REINPLACE= yes .else PLIST_SUB+= NATIVE:="@comment " .endif @@ -97,7 +98,6 @@ PLIST_SUB+= PLUGIN:="" .if defined(WITH_HOTSPOT) PLIST_SUB+= HOTSPOT:="" -USE_REINPLACE= yes .if defined(NODEBUG) HOTSPOT_TARGETS=product1 product .else @@ -121,6 +121,17 @@ BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/diablo-jdk13 .endif .endif +.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) +PTHREAD_FILES= common/Defs.gmk \ + common/Program.gmk \ + java/hpi/native/Makefile \ + sun/cmm/Makefile \ + ../ext/plugin/build/solaris/GNUmakefile \ + ../../hotspot1.3.1/build/linux/platform_i486 \ + ../../hotspot1.3.1/build/bsd/makefiles/gcc.make \ + ../../hotspot1.3.1/build/linux/makefiles/vm.make +.endif + .if defined(WITH_HOTSPOT) && ${OSVERSION} < 500039 USE_GCC= 3.2 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -195,6 +206,11 @@ post-patch: @${REINPLACE_CMD} -e "s:PATH[)]gcc:PATH)gcc32:g ; s:PATH[)]g\+\+:PATH)g\+\+32:g" ${WRKSRC}/common/Defs-bsd.gmk .endif .endif +.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) + @for file in ${PTHREAD_FILES}; do \ + ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" ${WRKSRC}/$${file}; \ + done +.endif pre-build: .if defined(WITH_LINUX_BOOTSTRAP) diff --git a/java/jdk13/files/patch-vm.make b/java/jdk13/files/patch-vm.make new file mode 100644 index 00000000000..79cd4bc4d9a --- /dev/null +++ b/java/jdk13/files/patch-vm.make @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/build/linux/makefiles/vm.make.orig Tue Oct 7 16:47:45 2003 ++++ ../../hotspot1.3.1/build/linux/makefiles/vm.make Tue Oct 7 16:47:57 2003 +@@ -115,7 +115,7 @@ + + #--billh + #LIBS += -lnsl -lm -ldl -lpthread +-LIBS = -lm -lc_r ++LIBS = -lm -pthread + + JVM = jvm$(G_SUFFIX) + LIBJVM = lib$(JVM).so |