mirror of
https://git.freebsd.org/ports.git
synced 2025-05-16 01:01:49 -04:00
a548434ab2
able to find libjli.so from RPATH because argv[0] points to the symlink. Note it seems Linux does not have the problem when /proc/self/exe exists. If it does not exist, it also fails to find libjli.so. Clean up patches while I am here.
19 lines
936 B
Text
19 lines
936 B
Text
--- jdk/make/lib/ServiceabilityLibraries.gmk
|
|
+++ jdk/make/lib/ServiceabilityLibraries.gmk
|
|
@@ -244,6 +244,7 @@
|
|
CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
|
|
CFLAGS_debug := -DJPLIS_LOGGING, \
|
|
CFLAGS_release := -DNO_JPLIS_LOGGING, \
|
|
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
|
|
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
|
|
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
|
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
|
@@ -258,7 +259,7 @@
|
|
LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
|
|
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_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" \
|