diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-30 04:47:25 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-30 04:47:25 +0000 |
| commit | 31f1b998e41cd0be9742d939e3ed1973b4207914 (patch) | |
| tree | 4a23aded726b160afa6db6276278744c94712a76 /java/openjdk7/files | |
| parent | Update screen 4.0.3 --> 4.2.1. (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=352670
Diffstat (limited to 'java/openjdk7/files')
| -rw-r--r-- | java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile b/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile new file mode 100644 index 000000000000..5d8b1a4e63bf --- /dev/null +++ b/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile @@ -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 |