cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

. Always fix up the pthread library references, even if we're not

Browse Source 
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
This commit is contained in:
Greg Lewis 2006-01-13 16:23:47 +00:00
parent 8281c63cda
commit 2f4041691b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=153397
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/jdk13/Makefile
View File

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