freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

. When building libsplashscreen, put the internal JDK header paths before

Browse Source 
the external system header paths.  This prevents us from picking up the
  jpeg headers from the system headers when building splashscreen_jpeg.c
  which caused an undefined reference to be present in libsplashscreen
  since the internal JDK jpeg headers remap the function names.

PR:		119654
This commit is contained in:
Greg Lewis
2008-10-15 03:34:38 +00:00
parent 97fa0810fe
commit a7d5955455
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/jdk16/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= java devel
MASTER_SITES= # http://download.java.net/jdk6/
# http://www.eyesbeyond.com/freebsddom/java/jdk16.html
java/jdk16/files/patch-j2se-splashscreen-Makefile
+22 -3
View File
@@ -1,9 +1,18 @@
$FreeBSD$
--- ../../j2se/make/sun/splashscreen/Makefile.orig Sat Feb 16 11:45:24 2008
+++ ../../j2se/make/sun/splashscreen/Makefile Sat Feb 16 11:45:37 2008
@@ -47,7 +47,7 @@
--- ../../j2se/make/sun/splashscreen/Makefile.orig 2008-10-13 20:02:03.000000000 -0700
+++ ../../j2se/make/sun/splashscreen/Makefile 2008-10-14 18:53:48.000000000 -0700
@@ -45,9 +45,16 @@
ifneq ($(PLATFORM), windows)
CFLAGS += -DWITH_X11
+endif
+
+# Internal JDK include paths should come before system include paths
+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+
+ifneq ($(PLATFORM), windows)
ifeq ($(PLATFORM), bsd)
ifneq ($(OS_VENDOR), NetBSD)
- ICONV_DIR = /usr/local
@@ -11,3 +20,13 @@ $FreeBSD$
ICONV_LIB = -L$(ICONV_DIR)/lib -liconv
endif
CPPFLAGS += -I$(OPENWIN_HOME)/include \
@@ -75,9 +82,6 @@
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-
#
# Has been converted to the JNI: generate JNI-style header files
#