diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-01-13 16:23:47 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-01-13 16:23:47 +0000 |
| commit | 2f4041691b16a11aa9b10b613388fba6a63d2ad7 (patch) | |
| tree | 8196ab6921a982e3e913dc4868844a3aa55f48d6 /java/jdk13/Makefile | |
| parent | 8281c63cda23adb1f3cbc0e38c326eab0a0ab71a (diff) | |
| download | ports-2f4041691b16a11aa9b10b613388fba6a63d2ad7.tar.gz ports-2f4041691b16a11aa9b10b613388fba6a63d2ad7.zip | |
. Always fix up the pthread library references, even if we're not
building either native threads or HotSpot. This is due to libcmm
always wanting to link against a pthread library, which was causing
problems on 7-CURRENT since it was erroneously hardwired to -lc_r.
This should really fix the problem.
Pointed out by: pointyhat via kris
Notes
Notes:
svn path=/head/; revision=153397
Diffstat (limited to 'java/jdk13/Makefile')
| -rw-r--r-- | java/jdk13/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index c9deea2623ab..a37f8d68e525 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -128,7 +128,6 @@ BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/jbootstrap .endif .endif -.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) PTHREAD_FILES= common/Defs.gmk \ common/Program.gmk \ java/hpi/native/Makefile \ @@ -137,7 +136,6 @@ PTHREAD_FILES= common/Defs.gmk \ ../../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 ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 ) EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar @@ -206,14 +204,12 @@ post-patch: ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ ${WRKSRC}/$${file}; \ done -.if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) @for file in ${PTHREAD_FILES}; do \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ -e "s:-lc_r:${PTHREAD_LIBS}:g" \ -e "s:-lpthread:${PTHREAD_LIBS}:g" \ ${WRKSRC}/$${file}; \ done -.endif pre-build: .if defined(WITH_LINUX_BOOTSTRAP) |