Mercurial > hg > release > icedtea6-1.11
view patches/openjdk/7000225-bad_tabs.patch @ 2930:88ad9f715193
Backport various Makefile changes so -Wno-clobbered is only used with GCC >= 4.3.
S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
S7000225: Sanity check on sane-alsa-headers is broken
S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
2013-09-02 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backports. Move
disable-cc-incompatible-sanity-checks and freetypeversion
to the end.
* patches/disable-cc-incompatible-sanity-checks.patch,
* patches/freetypeversion.patch:
Regenerated to work after new backports.
* patches/openjdk/6563752-ss12_support.patch,
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/openjdk/6974017-minorver_for_solaris.patch,
* patches/openjdk/6980281-majorver_for_solaris.patch,
* patches/openjdk/7000225-bad_tabs.patch,
* patches/openjdk/7038711-fix_no-clobber_usage.patch:
Backports from OpenJDK 7 to bring in latest Makefile
updates.
* NEWS: Update and order backports numerically.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 04 Sep 2013 00:13:08 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User andrew # Date 1290478643 0 # Tue Nov 23 02:17:23 2010 +0000 # Node ID beb9f3298ad3b32c24ceda7b7d3ed812152bafaa # Parent 565be51eb60e3660f9261d3cee23b81d0e50e440 7000225: Sanity check on sane-alsa-headers is broken Summary: Fix use of tab separators, ${alsa_version} expansion and conditional Reviewed-by: ohair diff --git a/make/common/shared/Sanity.gmk b/make/common/shared/Sanity.gmk --- openjdk/jdk/make/common/shared/Sanity.gmk +++ openjdk/jdk/make/common/shared/Sanity.gmk @@ -1389,20 +1389,21 @@ endif sane-alsa-headers: ifdef REQUIRED_ALSA_VERSION - if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ - $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ - " You have the following ALSA version installed: $${alsa_version) \n" \ - " Please reinstall ALSA (drivers and lib). You can download \n" \ - " the source distribution from http://www.alsa-project.org \n" \ - " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ - "" >> $(ERROR_FILE) ; \ - fi \ + @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ + if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ + $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ + " You have the following ALSA version installed: $${alsa_version} \n" \ + " Please reinstall ALSA (drivers and lib). You can download \n" \ + " the source distribution from http://www.alsa-project.org \n" \ + " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ + "" >> $(ERROR_FILE) ; \ + fi ; \ else \ - $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ - " Please install ALSA (drivers and lib). You can download the \n" \ - " source distribution from http://www.alsa-project.org or go to \n" \ - " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ - "" >> $(ERROR_FILE) ; \ + $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ + " Please install ALSA (drivers and lib). You can download the \n" \ + " source distribution from http://www.alsa-project.org or go to \n" \ + " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ + "" >> $(ERROR_FILE) ; \ fi endif