Mercurial > hg > release > icedtea6-1.11

view patches/disable-cc-incompatible-sanity-checks.patch @ 2930:88ad9f715193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 41fca4a6cb61
children
line wrap: on
line source

diff -Nru openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
--- openjdk.orig/jdk/make/common/Sanity.gmk	2012-10-26 19:25:40.000000000 +0100
+++ openjdk/jdk/make/common/Sanity.gmk	2013-09-02 17:26:52.257169562 +0100
@@ -91,8 +91,11 @@
     sane-ld_options \
     sane-ld_run_path \
     sane-alt_bootdir \
-    sane-bootdir \
-    sane-alsa-headers
+    sane-bootdir
+
+ifndef CROSS_COMPILATION
+sanity-all:: sane-alsa-headers
+endif
 
 ifdef OPENJDK
 sanity-all:: sane-freetype 
@@ -108,17 +111,21 @@
 #   (Which only happens with a full control build. The control makefiles are
 #    the files that set BUILD_MOTIF).
 #   We cannot sanity check something that has not been built yet. 
-ifeq ($(PLATFORM), linux)
-  ifneq ($(BUILD_MOTIF), true)
+ifndef CROSS_COMPILATION
+  ifeq ($(PLATFORM), linux)
+    ifneq ($(BUILD_MOTIF), true)
 sanity-all:: \
-    sane-motif
+  sane-motif
+    endif
   endif
 endif
 
 # Always check cups header paths on solaris & linux
-ifneq ($(PLATFORM), windows)
+ifndef CROSS_COMPILATION
+  ifneq ($(PLATFORM), windows)
 sanity-all:: \
     sane-cups
+  endif
 endif
 
 # Always check hotspot binary paths even if we are building them from scratch
diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2013-09-02 17:03:28.039330395 +0100
+++ openjdk/jdk/make/common/shared/Sanity.gmk	2013-09-02 17:32:35.854512833 +0100
@@ -159,6 +159,11 @@
 # Get ALL_SETTINGS defined
 include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
 
+ifndef CROSS_COMPILATION
+MORE_PHONY_RULES = \
+  sane-freetype
+endif
+
 .PHONY: \
 	sane-copyrightyear\
 	sane-settings \
@@ -187,8 +192,7 @@
 	sane-outputdir \
 	sane-alt_bootdir \
 	sane-bootdir \
-	sane-motif \
-        sane-cups \
+	sane-cups \
 	sane-devtools_path \
 	sane-compiler_path \
 	sane-unixcommand_path \
@@ -211,7 +215,7 @@
 	sane-zip_version \
 	sane-unzip_version \
  	sane-msvcrt_path \
-        sane-freetype
+        $(MORE_PHONY_RULES)
 
 ######################################################
 # check for COPYRIGHT_YEAR variable