- Revert all damages done in r372338 and r379049.

- Really fix non-release builds. [1]

PR:		193009 [1]

7 files changed, 25 insertions, 115 deletions

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index b60fc8bab016..bf26d17fa68e 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -121,6 +121,7 @@ DEBUGFAST_DESC=		Build for debugging (with optimizations)
 RELEASE_DESC=		Build for release (default)
 TEST_DESC=		Run regression tests
 
+RELEASE_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/objcopy:${PORTSDIR}/devel/binutils
 RELEASE_CONFIGURE_ON=	--disable-debug-symbols
 TEST_ALL_TARGET=	test
 TEST_CONFIGURE_ON=	--with-jtreg=${WRKDIR}/jtreg
@@ -139,6 +140,9 @@ JDK_BUILD_TYPE=	fastdebug
 .else
 JDK_BUILD_TYPE=	release
 .endif
+.if empty(PORT_OPTIONS:MRELEASE)
+OBJCOPY=	${LOCALBASE}/bin/objcopy
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -194,8 +198,9 @@ post-patch:
 	    ${FILESDIR}/bsd.fontconfig.properties.in > \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    ${WRKSRC}/common/autoconf/toolchain.m4 \
+	    -e 's|%%OBJCOPY%%|${OBJCOPY}|' \
 	    ${WRKSRC}/configure \
+	    ${WRKSRC}/common/autoconf/toolchain.m4 \
 	    ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 	    ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd
index 5f8f9ad8027b..9dbd221dc3d5 100644
--- a/java/openjdk8/files/patch-bsd
+++ b/java/openjdk8/files/patch-bsd
@@ -6132,7 +6132,7 @@
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
-+    LDFLAGS_bsd := , \
++    LDFLAGS_bsd := -liconv, \
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
      LDFLAGS_SUFFIX_solaris := -lc, \
@@ -6242,7 +6242,7 @@
      LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
      LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
      LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
-+    LDFLAGS_SUFFIX_bsd :=  $(LIBZ), \
++    LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=instrument.dll" \
@@ -7457,48 +7457,6 @@
 +        return new KQueueSelectorImpl(this);
 +    }
 +}
---- ./jdk/src/bsd/doc/man/javah.1	Mon Dec 08 08:53:26 2014 -0800
-+++ ./jdk/src/bsd/doc/man/javah.1	Sun Feb 01 21:05:04 2015 -0800
-@@ -110,7 +110,7 @@
- 
- \&.:\fIyour-path\fR
- 
--Example: \f3\&.:/home/avh/classes:/usr/local/java/classes\fR
-+Example: \f3\&.:/home/avh/classes:/usr/local/share/java/classes\fR
- 
- \fIWindows\fR:
- 
---- ./jdk/src/bsd/doc/man/rmic.1	Mon Dec 08 08:53:26 2014 -0800
-+++ ./jdk/src/bsd/doc/man/rmic.1	Sun Feb 01 21:05:04 2015 -0800
-@@ -93,7 +93,7 @@
- .TP
- -classpath path
- .br
--Specifies the path the \f3rmic\fR command uses to look up classes\&. This option overrides the default or the \f3CLASSPATH\fR environment variable when it is set\&. Directories are separated by colons\&. The general format for path is: \f3\&.:<your_path>\fR, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Specifies the path the \f3rmic\fR command uses to look up classes\&. This option overrides the default or the \f3CLASSPATH\fR environment variable when it is set\&. Directories are separated by colons\&. The general format for path is: \f3\&.:<your_path>\fR, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .TP
- -d \fIdirectory\fR
- .br
-@@ -207,7 +207,7 @@
- .SH ENVIRONMENT\ VARIABLES    
- .TP     
- CLASSPATH
--Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .SH SEE\ ALSO    
- .TP 0.2i    
- \(bu
---- ./jdk/src/bsd/doc/man/rmid.1	Mon Dec 08 08:53:26 2014 -0800
-+++ ./jdk/src/bsd/doc/man/rmid.1	Sun Feb 01 21:05:04 2015 -0800
-@@ -301,7 +301,7 @@
- .SH ENVIRONMENT\ VARIABLES    
- .TP     
- CLASSPATH
--Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .SH SEE\ ALSO    
- .TP 0.2i    
- \(bu
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Sun Feb 01 21:05:04 2015 -0800
 @@ -0,0 +1,171 @@
diff --git a/java/openjdk8/files/patch-configure b/java/openjdk8/files/patch-configure
index 62ed12627b1b..69b099a9d483 100644
--- a/java/openjdk8/files/patch-configure
+++ b/java/openjdk8/files/patch-configure
@@ -1,10 +1,11 @@
 --- configure
 +++ configure
-@@ -26,4 +26,6 @@
+@@ -26,4 +26,7 @@
  # make sure that is called using bash.
  
  this_script_dir=`dirname $0`
 -bash $this_script_dir/common/autoconf/configure "$@"
 +export CONFIG_SHELL=%%LOCALBASE%%/bin/bash
 +export MAKE=%%LOCALBASE%%/bin/gmake
++export OBJCOPY=%%OBJCOPY%%
 +%%LOCALBASE%%/bin/bash $this_script_dir/common/autoconf/configure "$@"
diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
index 784549faaed7..040b7bab00b1 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
@@ -5,7 +5,7 @@
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
    else ifeq ($(OPENJDK_TARGET_OS), bsd)
 -    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG
-+    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%
++    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) %%ICONV_CPPFLAGS%%
    else
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
    endif
diff --git a/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk b/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk
deleted file mode 100644
index da8fefc404c1..000000000000
--- a/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk
+++ /dev/null
@@ -1,54 +0,0 @@
---- jdk/make/CompileLaunchers.gmk	2014-11-25 21:13:15 UTC
-+++ jdk/make/CompileLaunchers.gmk	
-@@ -49,7 +49,7 @@ else
-   ORIGIN_ROOT := /..
- endif
- 
--ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
-+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx), )
-   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
- else
-   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
-@@ -90,8 +90,6 @@ define SetupLauncher
-   $1_LDFLAGS := $3
-   $1_LDFLAGS_SUFFIX :=
-   ifeq ($(OPENJDK_TARGET_OS), bsd)
--    $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
--        -Wl,--no-whole-archive
-     $1_LDFLAGS_SUFFIX += -pthread
-   endif
- 
-@@ -177,6 +175,8 @@ define SetupLauncher
-           $(ORIGIN_ARG) \
-           $$($1_LDFLAGS), \
-       LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
-+      LDFLAGS_bsd := -pthread \
-+          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
-       LDFLAGS_linux := -lpthread \
-           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
-       LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
-@@ -187,6 +187,7 @@ define SetupLauncher
-       LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
-           $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
-       LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
-+      LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lc, \
-       LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
-       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
-       OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
-@@ -203,7 +204,7 @@ define SetupLauncher
- 
-   BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
- 
--  ifneq (,$(filter $(OPENJDK_TARGET_OS), bsd macosx aix))
-+  ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
-     $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
-   endif
- 
-@@ -499,6 +500,7 @@ $(eval $(call SetupNativeCompilation,BUI
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_linux := -lc, \
-     LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
-+    LDFLAGS_bsd := -lc, \
-     LDFLAGS_SUFFIX := $(LIBCXX), \
-     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
-     OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
diff --git a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
index 376f1997283e..7c55ac72243a 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
@@ -5,11 +5,11 @@
          -I$(JDK_TOPDIR)/src/share/npt \
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
 -    CFLAGS_bsd := -DLIBICONV_PLUG, \
-+    CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
++    CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
--    LDFLAGS_bsd := , \
+-    LDFLAGS_bsd := -liconv, \
 +    LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
index 49abeced3eda..451f7f0ff001 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
@@ -1,20 +1,20 @@
 --- jdk/make/lib/ServiceabilityLibraries.gmk	2014-11-25 21:11:53 UTC
 +++ jdk/make/lib/ServiceabilityLibraries.gmk	
-@@ -252,15 +252,14 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -252,7 +252,7 @@
      CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
      CFLAGS_debug := -DJPLIS_LOGGING, \
      CFLAGS_release := -DNO_JPLIS_LOGGING, \
 -    CFLAGS_bsd := -DLIBICONV_PLUG, \
-+    CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
++    CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN) \
-         $(LIBINSTRUMENT_LDFLAGS), \
-     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
-     LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
--    LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
--        -Xlinker --no-whole-archive, \
-+    LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
-     LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
-         -framework Cocoa -framework Security -framework ApplicationServices, \
-     LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
+@@ -268,7 +268,7 @@
+     LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
+     LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
+     LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
+-    LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \
++    LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \
+     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+     RC_FLAGS := $(RC_FLAGS) \
+         -D "JDK_FNAME=instrument.dll" \