Advertisement
Guest User

Untitled

a guest
Jul 30th, 2018
126
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Make 2.19 KB | None | 0 0
  1. --- jdk/make/common/shared/Sanity.gmk.orig  2018-07-30 04:34:17.751452000 +0800
  2. +++ jdk/make/common/shared/Sanity.gmk   2018-07-30 04:34:45.787027000 +0800
  3. @@ -106,11 +106,6 @@
  4.      elif [ -f /etc/lsb-release ] ; then \
  5.        $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
  6.      fi)
  7. -  ALSA_INCLUDE=/usr/include/alsa/version.h
  8. -  ALSA_LIBRARY=/usr/lib/libasound.so
  9. -  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
  10. -           $(SED) -e 's@.*"\(.*\)".*@\1@' )
  11. -  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
  12.  endif
  13.  
  14.  ifeq ($(PLATFORM), macosx)
  15. @@ -1371,35 +1366,6 @@
  16.           "" >> $(WARNING_FILE) ; \
  17.           fi
  18.    endif
  19. -endif
  20. -
  21. -######################################################
  22. -# Check that ALSA headers and libs are installed and
  23. -# that the header has the right version. We only
  24. -# need /usr/include/alsa/version.h and /usr/lib/libasound.so
  25. -######################################################
  26. -
  27. -ifdef REQUIRED_ALSA_VERSION
  28. -  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
  29. -endif
  30. -sane-alsa-headers:
  31. -ifdef REQUIRED_ALSA_VERSION
  32. -   @if [ "$(ALSA_CHECK)" != "missing" ] ; then \
  33. -       if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
  34. -       $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
  35. -       "      You have the following ALSA version installed: $${alsa_version} \n" \
  36. -       "      Please reinstall ALSA (drivers and lib). You can download \n" \
  37. -       "      the source distribution from http://www.alsa-project.org \n" \
  38. -       "      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
  39. -       "" >> $(ERROR_FILE) ; \
  40. -       fi ; \
  41. -   else \
  42. -       $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
  43. -       "      Please install ALSA (drivers and lib). You can download the \n" \
  44. -       "      source distribution from http://www.alsa-project.org or go to \n" \
  45. -       "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
  46. -       "" >> $(ERROR_FILE) ; \
  47. -   fi
  48.  endif
  49.  
  50.  # If a sanity file doesn't exist, just make sure it's dir exists
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement