openjdk: Add patch to avoid an empty -I flag

svn path=/nixpkgs/trunk/; revision=28095
This commit is contained in:
Shea Levy 2011-08-01 01:17:08 +00:00
parent 0e9cda68fc
commit ec41a120fb
2 changed files with 18 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400
@@ -223,12 +223,6 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
-ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
- $(wildcard /usr/include/X11/extensions))
-endif
-
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
endif

View File

@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
''; '';
patches = [ ./cppflags-include-fix.patch ];
makeFlags = [ makeFlags = [
"SORT=${coreutils}/bin/sort" "SORT=${coreutils}/bin/sort"
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"