diff options
| author | jkim <jkim@FreeBSD.org> | 2019-03-29 07:19:00 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2019-03-29 07:19:00 +0800 |
| commit | b6c2bc4a83694cd62e0a56d668af2e1fc35fac95 (patch) | |
| tree | 3460ea61fb342c19fda25926612c5c625b716ff5 /java | |
| parent | b2f4505e34021aaa54a10b461cb1fe9d1852f0f0 (diff) | |
| download | freebsd-ports-gnome-b6c2bc4a83694cd62e0a56d668af2e1fc35fac95.tar.gz freebsd-ports-gnome-b6c2bc4a83694cd62e0a56d668af2e1fc35fac95.tar.zst freebsd-ports-gnome-b6c2bc4a83694cd62e0a56d668af2e1fc35fac95.zip | |
Refine r496923.
libinstrument.so and libjdwp.so do not need anything from $LOCALBASE but
libsplashscreen.so does. For example,
% cd /usr/local/openjdk11
% bin/java -jar demo/jfc/SwingSet2/SwingSet2.jar
ld-elf.so.1: /usr/local/openjdk11/lib/libsplashscreen.so: Undefined symbol
"libiconv_open"
PR: 236759
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk11/Makefile | 13 | ||||
| -rw-r--r-- | java/openjdk11/files/patch-make_autoconf_libraries.m4 | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 48ebfcdf2f3b..c9a0e9d9a517 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= https://github.com/battleblow/openjdk-jdk11u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -111,10 +111,11 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 JDK_BUILD_JVM= server .if empty(ICONV_LIB) -ICONV_CPPFLAGS= -DLIBICONV_PLUG +ICONV_CFLAGS= -DLIBICONV_PLUG .else -ICONV_CPPFLAGS= -I${LOCALBASE}/include -ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} .endif post-patch: @@ -123,6 +124,10 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure \ ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4 index d496b441a333..4c3f45ca80d0 100644 --- a/java/openjdk11/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4 @@ -1,11 +1,17 @@ --- make/autoconf/libraries.m4 +++ make/autoconf/libraries.m4 -@@ -182,8 +182,8 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + LIBS="$save_LIBS" if test "x$OPENJDK_TARGET_OS" = "xbsd"; then - if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then +- if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then - ICONV_CFLAGS="-I$PACKAGE_PATH/include" - ICONV_LDFLAGS="-L$PACKAGE_PATH/lib" ++ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% ++ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then + ICONV_CFLAGS="-I/usr/local/include" + ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv |