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