svn commit: r392605 - head/java/openjdk8/files
Jung-uk Kim
jkim at FreeBSD.org
Mon Jul 20 22:10:20 UTC 2015
Author: jkim
Date: Mon Jul 20 22:10:17 2015
New Revision: 392605
URL: https://svnweb.freebsd.org/changeset/ports/392605
Log:
Fix few more mismerges in the previous update.
Modified:
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/files/patch-jdk-make-lib-Awt2dLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Mon Jul 20 21:16:09 2015 (r392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Mon Jul 20 22:10:17 2015 (r392605)
@@ -14,7 +14,7 @@
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
else ifeq ($(OPENJDK_TARGET_OS), bsd)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
-+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib %%ICONV_LDFLAGS%% -pthread
++ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
else # .. all other Unixes can use X_LIBS
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
endif
Modified: head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk Mon Jul 20 21:16:09 2015 (r392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk Mon Jul 20 22:10:17 2015 (r392605)
@@ -1,11 +1,15 @@
--- jdk/make/lib/CoreLibraries.gmk.orig 2015-07-18 14:40:01.000000000 -0700
+++ jdk/make/lib/CoreLibraries.gmk 2015-07-18 14:40:47.000000000 -0700
-@@ -523,11 +523,11 @@
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
-- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
-+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
+@@ -510,7 +510,7 @@
+ ifeq ($(OPENJDK_TARGET_OS), bsd)
+ BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+- BSD_ICONV_CFLAGS += -DLIBICONV_PLUG
++ BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%%
+ endif
+ endif
+
+@@ -527,7 +527,7 @@
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
Modified: head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Mon Jul 20 21:16:09 2015 (r392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk Mon Jul 20 22:10:17 2015 (r392605)
@@ -1,14 +1,14 @@
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700
-@@ -269,7 +269,7 @@
- CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
- CFLAGS_debug := -DJPLIS_LOGGING, \
- CFLAGS_release := -DNO_JPLIS_LOGGING, \
-- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
-+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
+@@ -255,7 +255,7 @@
+ endif
+ BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+- BSD_ICONV_CFLAGS += -DLIBICONV_PLUG
++ BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%%
+ endif
+ endif
+
@@ -283,7 +283,7 @@
LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
More information about the svn-ports-head
mailing list