diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-15 21:52:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-15 21:53:26 +0200 |
| commit | 1b27dff7d270493be2026e1de0d0ed1aea16118f (patch) | |
| tree | c150d8d207782baf6785e5a132a05953effbb454 /package/openjdk7 | |
| parent | da074de37f3f49ff70644bf37178e31d1ca0f065 (diff) | |
another round of openjdk7 build fixes
Diffstat (limited to 'package/openjdk7')
| -rw-r--r-- | package/openjdk7/Makefile | 4 | ||||
| -rw-r--r-- | package/openjdk7/patches/openadk.patch | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 1b654300b..c8821b5f6 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -102,11 +102,11 @@ OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$ BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ OTHER_LDFLAGS='$(LDFLAGS_FOR_BUILD)' \ + ALSA_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' \ ALT_OPENWIN_HOME=$(STAGING_HOST_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" \ - ARCH=$(ARCH_FOR_BUILD) + ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" HOST_STYLE:= auto HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index 3001aff5b..601640a92 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -12,8 +12,8 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in patches/boot/demos.patch patches/boot/fphexconstants.patch \ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch --- icedtea-2.4.7.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.4.7/patches/openadk.patch 2014-05-13 16:57:07.173804037 +0200 -@@ -0,0 +1,7009 @@ ++++ icedtea-2.4.7/patches/openadk.patch 2014-05-15 15:52:54.503242117 +0200 +@@ -0,0 +1,7020 @@ +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2014-02-20 19:51:45.000000000 +0100 ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-05-13 16:56:38.917714592 +0200 @@ -6993,6 +6993,17 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + # If a sanity file doesn't exist, just make sure it's dir exists + $(SANITY_FILES): + -@$(prep-target) ++diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile ++--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2014-04-12 01:23:06.000000000 +0200 +++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile 2014-05-15 15:49:03.886269427 +0200 ++@@ -72,6 +72,7 @@ ++ -DUSE_PORTS=TRUE \ ++ -DUSE_PLATFORM_MIDI_OUT=TRUE \ ++ -DUSE_PLATFORM_MIDI_IN=TRUE \ +++ $(ALSA_CPPFLAGS) \ ++ -I$(SHARE_SRC)/native/com/sun/media/sound ++ ++ # +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk +--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2014-04-12 01:23:06.000000000 +0200 ++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2014-05-01 20:03:03.681930476 +0200 |