Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Feb 2015 06:54:31 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380064 - in head/java/openjdk8: . files
Message-ID:  <201502270654.t1R6sVQA096925@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Feb 27 06:54:30 2015
New Revision: 380064
URL: https://svnweb.freebsd.org/changeset/ports/380064
QAT: https://qat.redports.org/buildarchive/r380064/

Log:
  - Revert all damages done in r372338 and r379049.
  - Really fix non-release builds. [1]
  
  PR:		193009 [1]

Deleted:
  head/java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk
Modified:
  head/java/openjdk8/Makefile
  head/java/openjdk8/files/patch-bsd
  head/java/openjdk8/files/patch-configure
  head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
  head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
  head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/Makefile	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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 (wi
 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

Modified: head/java/openjdk8/files/patch-bsd
==============================================================================
--- head/java/openjdk8/files/patch-bsd	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/files/patch-bsd	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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 @@

Modified: head/java/openjdk8/files/patch-configure
==============================================================================
--- head/java/openjdk8/files/patch-configure	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/files/patch-configure	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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 "$@"

Modified: head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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

Modified: head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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, \

Modified: head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk	Fri Feb 27 06:32:02 2015	(r380063)
+++ head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk	Fri Feb 27 06:54:30 2015	(r380064)
@@ -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" \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502270654.t1R6sVQA096925>