iconv include/link paths

[Kurt Miller]

Hi Greg, Christos,

On OpenBSD libiconv is a port/package and installs under
PACKAGE_PATH. Isn't that the case for FreeBSD and NetBSD too?

Does the following diff help or at least not hurt FreeBSD and
NetBSD builds? If there's an issue, I'll restrict the changes
to OpenBSD only.

Thanks,
-Kurt

diff -r ce213452b047 make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk       Wed May 06 12:00:09 2015 -0400
+++ b/make/lib/Awt2dLibraries.gmk       Wed May 06 12:11:41 2015 -0400
@@ -1256,7 +1256,7 @@
   else ifeq ($(OPENJDK_TARGET_OS), solaris)
     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include 
-I$(OPENWIN_HOME)/include/X11/extensions
   else ifeq ($(OPENJDK_TARGET_OS), bsd)
-    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG
+    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include 
-DLIBICONV_PLUG
   else
     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
   endif
diff -r ce213452b047 make/lib/CoreLibraries.gmk
--- a/make/lib/CoreLibraries.gmk        Wed May 06 12:00:09 2015 -0400
+++ b/make/lib/CoreLibraries.gmk        Wed May 06 12:11:41 2015 -0400
@@ -516,11 +516,11 @@
     CFLAGS := $(CFLAGS_JDKLIB) \
         -I$(JDK_TOPDIR)/src/share/npt \
         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
-    CFLAGS_bsd := -DLIBICONV_PLUG, \
+    CFLAGS_bsd := -I$(PACKAGE_PATH)/include -DLIBICONV_PLUG, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_bsd := -liconv, \
+    LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \
     LDFLAGS_macosx := -liconv, \
     LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
     LDFLAGS_SUFFIX_solaris := -lc, \
diff -r ce213452b047 make/lib/ServiceabilityLibraries.gmk
--- a/make/lib/ServiceabilityLibraries.gmk      Wed May 06 12:00:09 2015 -0400
+++ b/make/lib/ServiceabilityLibraries.gmk      Wed May 06 12:11:41 2015 -0400
@@ -256,7 +256,7 @@
     CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    CFLAGS_bsd := -DLIBICONV_PLUG, \
+    CFLAGS_bsd := -I$(PACKAGE_PATH)/include -DLIBICONV_PLUG, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -272,7 +272,7 @@
     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_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static 
$(LIBDL),\
-    LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \
+    LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
     RC_FLAGS := $(RC_FLAGS) \
         -D "JDK_FNAME=instrument.dll" \