mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Fix few more mismerges in the previous update.

Browse Source
This commit is contained in:
Jung-uk Kim 2015-07-20 22:10:17 +00:00
parent 1ee26da0bb
commit 139ceeaf09
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=392605
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
View File

@ -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

16
java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
View File

@ -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), \

18
java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
View File

@ -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), \