svn commit: r352670 - head/java/openjdk7/files

[Jung-uk Kim]

Author: jkim
Date: Wed Apr 30 04:47:25 2014
New Revision: 352670
URL: http://svnweb.freebsd.org/changeset/ports/352670
QAT: https://qat.redports.org/buildarchive/r352670/

Log:
  Include bundled header files before others.  For example, this fixes build
  with conflicting header files from graphics/jpeg.  Note OTHER_INCLUDES or
  OTHER_CPPFLAGS may be used instead.  However, I think this is the least
  intrusive change.  Also, note java/openjdk6 already has a similar fix and
  java/openjdk8 does not need it.
  
  Tested by:	Jonathan Chen (jonc at chen dot org dot nz)

Added:
  head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile   (contents, props changed)

Added: head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile	Wed Apr 30 04:47:25 2014	(r352670)
@@ -0,0 +1,28 @@
+--- jdk/make/sun/splashscreen/Makefile	2013-09-06 14:27:41.000000000 -0400
++++ jdk/make/sun/splashscreen/Makefile	2014-04-30 00:10:52.000000000 -0400
+@@ -61,6 +61,12 @@
+ 
+ CFLAGS += -DSPLASHSCREEN
+ 
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
++ifneq ($(SYSTEM_ZLIB),true)
++  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++endif
++
+ ifeq ($(PLATFORM), macosx)
+   CFLAGS += -DWITH_MACOSX
+ 
+@@ -121,11 +127,7 @@
+   CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
+   CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
+ endif
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+-ifneq ($(SYSTEM_ZLIB),true)
+-  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-else
++ifeq ($(SYSTEM_ZLIB),true)
+   OTHER_CFLAGS += $(ZLIB_CFLAGS)
+   OTHER_LDLIBS += $(ZLIB_LIBS)
+ endif