Mercurial > hg > release > icedtea7-2.4

changeset 2639:bfcb188e2568

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make clean-crypto targets depend on JDK being built. 2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (check-crypto): Depend on icedtea.stamp. (add-archive): Move into correct position in file. (clean-add-archive): Likewise. (check-crypto-debug): Depend on icedtea-debug.stamp. (clean-crypto-boot): Depend on icedtea-boot.stamp.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 05 Jun 2013 23:01:32 +0100
parents 609b5317bd98
children 76348ab9702d
files ChangeLog Makefile.am
diffstat 2 files changed, 28 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 05 22:56:36 2013 +0100
+++ b/ChangeLog	Wed Jun 05 23:01:32 2013 +0100
@@ -1,3 +1,12 @@
+2013-06-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(check-crypto): Depend on icedtea.stamp.
+	(add-archive): Move into correct position in file.
+	(clean-add-archive): Likewise.
+	(check-crypto-debug): Depend on icedtea-debug.stamp.
+	(clean-crypto-boot): Depend on icedtea-boot.stamp.
+
 2013-06-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1280: Updating/Installing OpenJDK should recreate the
--- a/Makefile.am	Wed Jun 05 22:56:36 2013 +0100
+++ b/Makefile.am	Wed Jun 05 23:01:32 2013 +0100
@@ -1807,7 +1807,7 @@
 	fi
 	rm -f stamps/add-tzdata-support.stamp
 
-stamps/check-crypto.stamp: stamps/cryptocheck.stamp
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
 	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
@@ -1817,6 +1817,22 @@
 clean-check-crypto:
 	rm -f stamps/check-crypto.stamp
 
+stamps/add-archive.stamp: stamps/icedtea.stamp
+if !ENABLE_JAMVM
+if !ENABLE_CACAO
+if !ZERO_BUILD
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+	fi
+endif
+endif
+endif
+	touch stamps/add-archive.stamp
+
+clean-add-archive:
+	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+	rm -f stamps/add-archive.stamp
+
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
  stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
@@ -1919,7 +1935,7 @@
 	fi
 	rm -f stamps/add-tzdata-support-debug.stamp
 
-stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
 	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
@@ -1929,22 +1945,6 @@
 clean-check-crypto-debug:
 	rm -f stamps/check-crypto-debug.stamp
 
-stamps/add-archive.stamp: stamps/icedtea.stamp
-if !ENABLE_JAMVM
-if !ENABLE_CACAO
-if !ZERO_BUILD
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
-	fi
-endif
-endif
-endif
-	touch stamps/add-archive.stamp
-
-clean-add-archive:
-	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
-	rm -f stamps/add-archive.stamp
-
 stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
@@ -2072,7 +2072,7 @@
 	fi
 	rm -f stamps/add-tzdata-support-boot.stamp
 
-stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
 	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi