diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-01-19 19:28:40 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-01-19 19:28:40 +0000 |
| commit | 21c8a9307ff2db131e7b3f0ecd6b8cc9a03f6991 (patch) | |
| tree | 3449612acb9d246199f067520b3712da6945017c /java | |
| parent | . Convert spaces to tabs. (diff) | |
. Add ${LOCALBASE}/lib to the default search path for libraries when using
JNI.
XXX: Maybe ${X11BASE}/lib and /lib (5.x dynamic root support) should also
be added? /lib is part of the default search path on Linux.
Requested by: marcus
Notes
Notes:
svn path=/head/; revision=98578
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk13/Makefile | 6 | ||||
| -rw-r--r-- | java/jdk13/files/patch-javai_md.c | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 780702122f01..42b64800d4c4 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk13.html @@ -48,6 +48,7 @@ JDK_PATCHSET_VERSION= 9 ONLY_FOR_ARCHS= i386 USE_GMAKE= yes +USE_REINPLACE= yes RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \ @@ -86,7 +87,6 @@ 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 @@ -191,6 +191,8 @@ pre-patch: post-patch: @-${FIND} ${WRKDIR} -name SCCS -exec ${RM} -rf {} \; + @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \ + ${WRKSRC}/../src/solaris/javavm/runtime/javai_md.c .if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT) @for file in ${PTHREAD_FILES}; do \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" ${WRKSRC}/$${file}; \ diff --git a/java/jdk13/files/patch-javai_md.c b/java/jdk13/files/patch-javai_md.c new file mode 100644 index 000000000000..5a70733cc80c --- /dev/null +++ b/java/jdk13/files/patch-javai_md.c @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../src/solaris/javavm/runtime/javai_md.c 24 Jul 2003 07:06:56 -0000 1.7 ++++ ../src/solaris/javavm/runtime/javai_md.c 15 Jan 2004 07:37:23 -0000 +@@ -137,7 +137,7 @@ + #ifdef __linux__ + #define DEFAULT_LD_LIBRARY_PATH "/usr/lib:/lib" /* See ld.so(8) */ + #else +-#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */ ++#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */ + #endif + { + /* Get the user setting of LD_LIBRARY_PATH */ |