changeset in /hg/icedtea: * Makefile.am (patch.stamp): Stop and ...
Mark Wielaard
mark at klomp.org
Sun Feb 17 06:06:54 PST 2008
changeset 44a98af99ca1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=44a98af99ca1
description:
* Makefile.am (patch.stamp): Stop and fail when patch doesn't apply.
(clean-patch): Warn and fail when patch doesn't revert.
(patch-ecj.stamp): Fail when patch doesn't apply.
(clean-patch-ecj): Fail when patch doesn't revert.
* Makefile.in: Regenerated.
* patches/icedtea-version.patch: Remove extra hunk.
diffstat:
4 files changed, 68 insertions(+), 29 deletions(-)
ChangeLog | 9 +++++++++
Makefile.am | 38 +++++++++++++++++++++++++++++---------
Makefile.in | 39 ++++++++++++++++++++++++++++++---------
patches/icedtea-version.patch | 11 -----------
diffs (200 lines):
diff -r fff544cac3f2 -r 44a98af99ca1 ChangeLog
--- a/ChangeLog Fri Feb 15 16:07:10 2008 -0500
+++ b/ChangeLog Sun Feb 17 15:05:27 2008 +0100
@@ -1,3 +1,12 @@ 2008-02-15 Lillian Angel <langel at redha
+2008-02-17 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (patch.stamp): Stop and fail when patch doesn't apply.
+ (clean-patch): Warn and fail when patch doesn't revert.
+ (patch-ecj.stamp): Fail when patch doesn't apply.
+ (clean-patch-ecj): Fail when patch doesn't revert.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-version.patch: Remove extra hunk.
+
2008-02-15 Lillian Angel <langel at redhat.com>
* configure.ac: Added conditional check for libffi.
diff -r fff544cac3f2 -r 44a98af99ca1 Makefile.am
--- a/Makefile.am Fri Feb 15 16:07:10 2008 -0500
+++ b/Makefile.am Sun Feb 17 15:05:27 2008 +0100
@@ -248,20 +248,31 @@ ICEDTEA_PATCHES = \
$(DISTRIBUTION_PATCHES)
stamps/patch.stamp: stamps/clone.stamp
+ all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
- echo Checking $$p ; \
- if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+ if test x$${all_patches_ok} == "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
$(PATCH) -l -p0 < $$p ; \
+ else \
+ test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
fi ; \
- done
- mkdir -p stamps
- touch stamps/patch.stamp
+ done ; \
+ mkdir -p stamps ; \
+ touch stamps/patch.stamp ; \
+ if ! test x$${all_patches_ok} == "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-patch before retrying a fix ; \
+ false; \
+ fi
+
clean-patch:
rm -f stamps/patch.stamp
+ all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -269,8 +280,13 @@ clean-patch:
then \
echo Reverting $$p ; \
$(PATCH) -l -p0 -R < $$p ; \
+ else \
+ all_patches_ok=no ; \
fi ; \
- done
+ done ; \
+ if ! test x$${all_patches_ok} == "xyes" ; then \
+ echo "WARNING Not all patches reverted cleanly" ; \
+ fi
# OpenJDK ecj Source Preparation Targets
# ======================================
@@ -308,9 +324,11 @@ stamps/patch-ecj.stamp: stamps/clone-ecj
then \
echo Applying $(ICEDTEA_ECJ_PATCH) ; \
$(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
- fi
- mkdir -p stamps
- touch stamps/patch-ecj.stamp
+ mkdir -p stamps; \
+ touch stamps/patch-ecj.stamp; \
+ else \
+ false; \
+ fi
clean-patch-ecj:
rm -f stamps/patch-ecj.stamp
@@ -319,6 +337,8 @@ clean-patch-ecj:
then \
echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
$(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
+ else \
+ false; \
fi
# Bootstrap Directory Targets
diff -r fff544cac3f2 -r 44a98af99ca1 Makefile.in
--- a/Makefile.in Fri Feb 15 16:07:10 2008 -0500
+++ b/Makefile.in Sun Feb 17 15:05:27 2008 +0100
@@ -109,6 +109,8 @@ JAVAC = @JAVAC@
JAVAC = @JAVAC@
JAVAH = @JAVAH@
LDFLAGS = @LDFLAGS@
+LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
+LIBFFI_LIBS = @LIBFFI_LIBS@
LIBGCJ_JAR = @LIBGCJ_JAR@
LIBOBJS = @LIBOBJS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
@@ -760,20 +762,30 @@ stamps/ports.stamp: stamps/clone.stamp
touch stamps/ports.stamp
stamps/patch.stamp: stamps/clone.stamp
+ all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
- echo Checking $$p ; \
- if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+ if test x$${all_patches_ok} == "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
$(PATCH) -l -p0 < $$p ; \
+ else \
+ test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
fi ; \
- done
- mkdir -p stamps
- touch stamps/patch.stamp
+ done ; \
+ mkdir -p stamps ; \
+ touch stamps/patch.stamp ; \
+ if ! test x$${all_patches_ok} == "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-patch before retrying a fix ; \
+ false; \
+ fi
clean-patch:
rm -f stamps/patch.stamp
+ all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -781,8 +793,13 @@ clean-patch:
then \
echo Reverting $$p ; \
$(PATCH) -l -p0 -R < $$p ; \
+ else \
+ all_patches_ok=no ; \
fi ; \
- done
+ done ; \
+ if ! test x$${all_patches_ok} == "xyes" ; then \
+ echo "WARNING Not all patches reverted cleanly" ; \
+ fi
# OpenJDK ecj Source Preparation Targets
# ======================================
@@ -817,9 +834,11 @@ stamps/patch-ecj.stamp: stamps/clone-ecj
then \
echo Applying $(ICEDTEA_ECJ_PATCH) ; \
$(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
- fi
- mkdir -p stamps
- touch stamps/patch-ecj.stamp
+ mkdir -p stamps; \
+ touch stamps/patch-ecj.stamp; \
+ else \
+ false; \
+ fi
clean-patch-ecj:
rm -f stamps/patch-ecj.stamp
@@ -828,6 +847,8 @@ clean-patch-ecj:
then \
echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
$(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
+ else \
+ false; \
fi
# Bootstrap Directory Targets
diff -r fff544cac3f2 -r 44a98af99ca1 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch Fri Feb 15 16:07:10 2008 -0500
+++ b/patches/icedtea-version.patch Sun Feb 17 15:05:27 2008 +0100
@@ -53,14 +53,3 @@
#define DEFAULT_JAVA_LAUNCHER "generic"
char** Arguments::_jvm_flags_array = NULL;
---- openjdkold/hotspot/build/linux/makefiles/vm.make 2008-02-12 04:14:13.000000000 -0500
-+++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-02-15 14:46:59.000000000 -0500
-@@ -98,7 +98,7 @@
- ifeq ($(CLOSED_DIR_EXISTS), true)
- VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"Java HotSpot(TM)\""
- else
-- VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"OpenJDK\""
-+ VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"IcedTea\""
- endif
- endif
-
More information about the distro-pkg-dev
mailing list