diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch new file mode 100644 index 0000000..0d3ce04 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk | ||
2 | index 55c0e88..220aa5c 100644 | ||
3 | --- openjdk/jdk/make/common/shared/Sanity.gmk | ||
4 | +++ openjdk/jdk/make/common/shared/Sanity.gmk | ||
5 | @@ -102,11 +102,6 @@ ifeq ($(PLATFORM), linux) | ||
6 | if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \ | ||
7 | $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \ | ||
8 | fi) | ||
9 | - ALSA_INCLUDE=/usr/include/alsa/version.h | ||
10 | - ALSA_LIBRARY=/usr/lib/libasound.so | ||
11 | - _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ | ||
12 | - $(SED) -e 's@.*\"\(.*\)\".*@\1@' ) | ||
13 | - ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) | ||
14 | endif | ||
15 | |||
16 | ifeq ($(PLATFORM), windows) | ||
17 | @@ -210,7 +210,6 @@ endif | ||
18 | sane-compiler \ | ||
19 | sane-link \ | ||
20 | sane-cacerts \ | ||
21 | - sane-alsa-headers \ | ||
22 | sane-ant_version \ | ||
23 | sane-zip_version \ | ||
24 | sane-unzip_version \ | ||
25 | @@ -1351,9 +1346,6 @@ endif | ||
26 | # need /usr/include/alsa/version.h and /usr/lib/libasound.so | ||
27 | ###################################################### | ||
28 | |||
29 | -ifdef REQUIRED_ALSA_VERSION | ||
30 | - ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) | ||
31 | -endif | ||
32 | sane-alsa-headers: | ||
33 | ifdef REQUIRED_ALSA_VERSION | ||
34 | @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ | ||