mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 01:53:13 -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.
15 lines
643 B
Text
15 lines
643 B
Text
--- jdk/make/lib/CoreLibraries.gmk
|
|
+++ jdk/make/lib/CoreLibraries.gmk
|
|
@@ -496,10 +496,11 @@
|
|
CFLAGS := $(CFLAGS_JDKLIB) \
|
|
-I$(JDK_TOPDIR)/src/share/npt \
|
|
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
|
|
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
|
|
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
|
|
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
|
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
|
- LDFLAGS_bsd := -liconv, \
|
|
+ LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
|
|
LDFLAGS_macosx := -liconv, \
|
|
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
|
|
LDFLAGS_SUFFIX_solaris := -lc, \
|