From 2f4041691b16a11aa9b10b613388fba6a63d2ad7 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 13 Jan 2006 16:23:47 +0000 Subject: . 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 --- java/jdk13/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/jdk13') 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) -- cgit v1.2.3