diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2017-09-27 20:58:16 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2017-09-27 20:58:16 +0300 |
commit | dae006a39cc57546d55cbb2f844e371e2a68fad0 (patch) | |
tree | b54a2c765067c7b75a2be35ee6fee824ed8768c5 | |
parent | b31531626d1c4bab9d7a295c609d4c2dbca13dce (diff) | |
download | openjdk-8-dae006a39cc57546d55cbb2f844e371e2a68fad0.tar.gz |
Add debian/patches/dyson-icedtea-sound.patch
-rw-r--r-- | debian/patches/dyson-icedtea-sound.patch | 17 | ||||
-rwxr-xr-x | debian/rules | 5 |
2 files changed, 19 insertions, 3 deletions
diff --git a/debian/patches/dyson-icedtea-sound.patch b/debian/patches/dyson-icedtea-sound.patch new file mode 100644 index 0000000..2906f4d --- /dev/null +++ b/debian/patches/dyson-icedtea-sound.patch @@ -0,0 +1,17 @@ +Index: openjdk-8/icedtea-sound/Makefile.am +=================================================================== +--- openjdk-8.orig/icedtea-sound/Makefile.am ++++ openjdk-8/icedtea-sound/Makefile.am +@@ -143,7 +143,11 @@ stamps/icedtea-sound-headers.stamp: stam + touch $@ + + $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/%.o: $(ICEDTEA_SOUND_NATIVE_SRCDIR)/%.c stamps/icedtea-sound-headers.stamp +- $(CC) $(IT_CFLAGS) -fPIC -I$(SYSTEM_JDK_DIR)/include/linux -I$(SYSTEM_JDK_DIR)/include/bsd -I$(SYSTEM_JDK_DIR)/include \ ++ $(CC) $(IT_CFLAGS) -fPIC \ ++ -I$(SYSTEM_JDK_DIR)/include/linux \ ++ -I$(SYSTEM_JDK_DIR)/include/bsd \ ++ -I$(SYSTEM_JDK_DIR)/include/solaris \ ++ -I$(SYSTEM_JDK_DIR)/include \ + -I$(ICEDTEA_SOUND_NATIVE_BUILDDIR) -o $@ -c $< + + $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/$(TARGET_NAME): $(ICEDTEA_SOUND_NATIVE_OBJECTS) diff --git a/debian/rules b/debian/rules index c3fbc63..5164da4 100755 --- a/debian/rules +++ b/debian/rules @@ -1051,9 +1051,8 @@ stamps/sound-configure: stamps/build mv $$(tar tf icedtea-sound.tar.xz | head -1 | sed 's,/.*,,') \ icedtea-sound patch -p1 < debian/patches/icedtea-sound.diff - if [ -x icedtea-sound/autogen.sh ]; then \ - cd icedtea-sound && ./autogen.sh; \ - fi + patch -p1 < debian/patches/dyson-icedtea-sound.patch + cd icedtea-sound && autoreconf -fiv cd icedtea-sound && ./configure \ --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) \ |