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

Refine r496923.

Browse Source 
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
This commit is contained in:
Jung-uk Kim
2019-03-28 23:19:00 +00:00
parent b57b9b54a9
commit d98a910efa
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/openjdk11/Makefile
View File

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

10
java/openjdk11/files/patch-make_autoconf_libraries.m4
View File

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