summaryrefslogtreecommitdiff
path: root/java/openjdk11/files/patch-make_autoconf_libraries.m4
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2019-03-26 20:48:04 +0000
committerGreg Lewis <glewis@FreeBSD.org>2019-03-26 20:48:04 +0000
commit17ca9c16ac93ca7e0544facbccc4f0a054e3a6fd (patch)
tree7ed9eeef856358ac92ad605a593e5c58af04179c /java/openjdk11/files/patch-make_autoconf_libraries.m4
parentMark benchmarks/netio as RESTRICTED. (diff)
Fixes for include path, jshell, and process issues.
* Put MD specific include files (e.g. jni_md.h) in a subdirectory named 'freebsd' rather than 'bsd'. [1] * Remove the necessity to always have /usr/local/include in the header paths and linker paths. This allows jshell to use the system iconv.h rather than the third party one and link correctly. [2] * Fix getting process commands and arguments on FreeBSD. * Bump PORTREVISION. All fixes need forward porting to openjdk12. PR: 236754 [1], 236759 [2] Submitted by: Kurt Miller [2]
Notes
Notes: svn path=/head/; revision=496923
Diffstat (limited to 'java/openjdk11/files/patch-make_autoconf_libraries.m4')
-rw-r--r--java/openjdk11/files/patch-make_autoconf_libraries.m413
1 files changed, 13 insertions, 0 deletions
diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4
new file mode 100644
index 000000000000..d496b441a333
--- /dev/null
+++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4
@@ -0,0 +1,13 @@
+--- make/autoconf/libraries.m4
++++ make/autoconf/libraries.m4
+@@ -182,8 +182,8 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+
+ if test "x$OPENJDK_TARGET_OS" = "xbsd"; then
+ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
+- ICONV_CFLAGS="-I$PACKAGE_PATH/include"
+- ICONV_LDFLAGS="-L$PACKAGE_PATH/lib"
++ ICONV_CFLAGS="-I/usr/local/include"
++ ICONV_LDFLAGS="-L/usr/local/lib"
+ ICONV_LIBS=-liconv
+ else
+ ICONV_CFLAGS=