From 1c4910aa4cf24a22a45bf4eb883fe16edad77506 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Wed, 18 Sep 2019 00:16:40 +0000
Subject: Add a port of OpenJDK 13

---
 java/openjdk13/files/cacerts                            | Bin 0 -> 98310 bytes
 java/openjdk13/files/patch-configure                    |  14 ++++++++++++++
 java/openjdk13/files/patch-make_autoconf_libraries.m4   |  15 +++++++++++++++
 .../files/patch-src_hotspot_os_bsd_os__bsd.cpp          |  11 +++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 java/openjdk13/files/cacerts
 create mode 100644 java/openjdk13/files/patch-configure
 create mode 100644 java/openjdk13/files/patch-make_autoconf_libraries.m4
 create mode 100644 java/openjdk13/files/patch-src_hotspot_os_bsd_os__bsd.cpp

(limited to 'java/openjdk13/files')

diff --git a/java/openjdk13/files/cacerts b/java/openjdk13/files/cacerts
new file mode 100644
index 000000000000..c07b7abaf5ef
Binary files /dev/null and b/java/openjdk13/files/cacerts differ
diff --git a/java/openjdk13/files/patch-configure b/java/openjdk13/files/patch-configure
new file mode 100644
index 000000000000..59daa4ff854f
--- /dev/null
+++ b/java/openjdk13/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2019-03-12 12:38:39.648907000 -0700
++++ configure	2019-03-12 12:39:04.275572000 -0700
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!%%LOCALBASE%%/bin/bash
+ #
+ # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+@@ -32,4 +32,4 @@
+ # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
+ # This trick is needed to get autoconf to co-operate properly.
+ # The ${-:+-$-} construction passes on bash options.
+-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
diff --git a/java/openjdk13/files/patch-make_autoconf_libraries.m4 b/java/openjdk13/files/patch-make_autoconf_libraries.m4
new file mode 100644
index 000000000000..0911464a6522
--- /dev/null
+++ b/java/openjdk13/files/patch-make_autoconf_libraries.m4
@@ -0,0 +1,15 @@
+--- make/autoconf/libraries.m4~	2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4	2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
+       ICONV_LDFLAGS="-L/usr/local/lib"
+       ICONV_LIBS=-liconv
+     elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+-      ICONV_CFLAGS=-DLIBICONV_PLUG
+-      ICONV_LDFLAGS=
+-      ICONV_LIBS=
++      ICONV_CFLAGS=%%ICONV_CFLAGS%%
++      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
++      ICONV_LIBS=%%ICONV_LIBS%%
+     else
+       ICONV_CFLAGS=
+       ICONV_LDFLAGS=
diff --git a/java/openjdk13/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk13/files/patch-src_hotspot_os_bsd_os__bsd.cpp
new file mode 100644
index 000000000000..8be2abe3388f
--- /dev/null
+++ b/java/openjdk13/files/patch-src_hotspot_os_bsd_os__bsd.cpp
@@ -0,0 +1,11 @@
+--- src/hotspot/os/bsd/os_bsd.cpp.orig	2019-03-28 21:47:08.000000000 -0700
++++ src/hotspot/os/bsd/os_bsd.cpp	2019-03-28 23:08:55.590922000 -0700
+@@ -361,7 +361,7 @@
+     #elif defined(__NetBSD__)
+       #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
+     #else
+-      #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
++      #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
+     #endif
+   #else
+     #define DEFAULT_LIBPATH OVERRIDE_LIBPATH
-- 
cgit v1.2.3