diff options
| author | phantom <phantom@FreeBSD.org> | 2003-03-15 17:57:58 +0800 |
|---|---|---|
| committer | phantom <phantom@FreeBSD.org> | 2003-03-15 17:57:58 +0800 |
| commit | 5df0834111afb63d8cc04a54f8bf2fec75a31023 (patch) | |
| tree | 27b46ceeaf0eb6a7f4843d8597a1f7a490c07248 /java/jdk15 | |
| parent | 330860a4ab62e1c1c6da4f11fe519a5d0464ecfb (diff) | |
| download | freebsd-ports-gnome-5df0834111afb63d8cc04a54f8bf2fec75a31023.tar.gz freebsd-ports-gnome-5df0834111afb63d8cc04a54f8bf2fec75a31023.tar.zst freebsd-ports-gnome-5df0834111afb63d8cc04a54f8bf2fec75a31023.zip | |
Fix checking of libc_r capabilities at FreeBSD version which
don't have pthread_attr_get_np() at all (early 4.7-STABLE and previous
versions).
Reported by: Phillip Oleson <poleson@verio.net>
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index f8782a5b0f8c..4ac38b35dab8 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html @@ -99,24 +99,40 @@ http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ Please place the patchset in ${DISTDIR}.\n .endif +# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates. +# Make check for reqiuired primities as early as possible + +TESTPROG=testos + .if ${OSVERSION} > 500000 LINKIT= -lc_r .else LINKIT= -pthread .endif -# JDK 1.4.1 require recent version of FreeBSD due to recent libc_r updates. check-os: .if !defined(SKIP_OS_TEST) - @mkdir -p ${WRKDIR} ; \ - gcc ${LINKIT} -o ${WRKDIR}/testos ${FILESDIR}/testos.c > /dev/null 2>&1 ; \ - ${WRKDIR}/testos 2>/dev/null + -@mkdir -p ${WRKDIR} ; \ + rm -f ${WRKDIR}/${TESTPROG} ; \ + gcc ${LINKIT} -o ${WRKDIR}/${TESTPROG} \ + ${FILESDIR}/${TESTPROG}.c > /dev/null 2>&1 + @if [ ! -f ${WRKDIR}/${TESTPROG} ] ; \ + then \ + /usr/bin/printf "\n\ +You must have a version of FreeBSD later than 4.7-STABLE\n\ +February 2003 or 5-CURRENT February 2003 to compile and\n\ +use JDK 1.4.1.\n\n" ; \ + exit 1 ; \ + fi + @${WRKDIR}/${TESTPROG} 2>/dev/null .endif pre-fetch: check-os @${ECHO_MSG} + @${ECHO_MSG} "NOTICES:" + @${ECHO_MSG} @${ECHO_MSG} "To build JDK 1.4.1 port, you should have at least" - @${ECHO_MSG} "1.5Gb of disk space!" + @${ECHO_MSG} "1.5Gb of free disk space in build area!" @${ECHO_MSG} @${ECHO_MSG} "Please use \`make -DNODEBUG' if you don't want to" @${ECHO_MSG} "install libraries and binaries with debugging support." |