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

. Fix the DEBUG build.

Browse Source 
PR:		193009
Submitted by:	Brian Gardner (openjdk@getsnappy.com)
This commit is contained in:
Greg Lewis 2015-02-15 21:18:12 +00:00
parent 5cbb14051c
commit 2c4da2b583
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=379049
2 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
java/openjdk8/files/patch-jdk-make-lib-CompileLaunchers.gmk Normal file
View File

@ -0,0 +1,54 @@
--- 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 $(LIBDL) -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 := -lstdc++ -lc, \
LDFLAGS_SUFFIX := $(LIBCXX), \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \

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

@ -1,6 +1,6 @@
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2014-11-08 19:59:40.000000000 -0800
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-08 20:00:50.000000000 -0800
@@ -252,7 +252,7 @@
--- 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
CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
CFLAGS_debug := -DJPLIS_LOGGING, \
CFLAGS_release := -DNO_JPLIS_LOGGING, \
@ -9,12 +9,12 @@
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -260,7 +260,7 @@
$(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 \
- LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
- -Xlinker --no-whole-archive, \
+ -Xlinker --no-whole-archive %%ICONV_LDFLAGS%% $(LIBZ), \
+ 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), \