/hg/icedtea6: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 26 02:54:52 PST 2013
changeset 8d60be81626f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8d60be81626f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 10:26:22 2013 +0000
PR1630: Make system JPEG/Zlib/PNG/GIF support optional
2013-12-24 Andrew John Hughes <gnu.andrew at redhat.com>
PR1630: Make system JPEG/Zlib/PNG/GIF support
optional
* patches/alternative_krb5_cache_fixup.patch:
Replace USE_SYSTEM_LCMS with SYSTEM_LCMS.
* patches/libraries-gif.patch: Split out
from libraries.patch.
* patches/libraries-jpeg.patch: Likewise.
* patches/libraries-png.patch: Likewise.
* patches/libraries-splashscreen.patch:
Rewritten using SYSTEM_{PNG,GIF,ZLIB,JPEG} flags.
* patches/libraries-zlib.patch:
Split out from libraries.patch.
* patches/linker-libs-order-zlib.patch:
Split out from linker-libs-order.patch. Only
applies if system zlib is being used.
* patches/linker-libs-order.patch:
Move system-zlib-specific parts to separate file.
* patches/openjdk/lcms2/system_lcms2.patch:
Replace USE_SYSTEM_LCMS with SYSTEM_LCMS.
* patches/rh661505-jpeg-nosys.patch:
New version that uses function calls appropriate for
the in-tree version.
* patches/security/20130618/8009071-improve_shape_handling.patch:
Regenerated as now applied before libraries-gif.patch,
which may or may not be applied.
2011-09-06 Andrew John Hughes <ahughes at redhat.com>
* patches/libraries.patch:
Split into parts for individual libraries.
Splashscreen parts rewritten.
* Makefile.am:
(ICEDTEA_PATCHES): Replace libraries.patch
with libraries-splashscreen.patch. Apply
other library patches depending on which
system libraries are used and which aren't.
Use a different version of the RH661505
patch, depending on whether the system
or in-tree JPEG library is used.
(ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS,
SYSTEM_ZLIB, JPEG_LIBS, JPEG_CFLAGS,
SYSTEM_JPEG, PNG_LIBS, PNG_CFLAGS,
SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS,
SYSTEM_GIF. Replace USE_SYSTEM_LCMS with
SYSTEM_LCMS for consistency.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_ZLIB): New macro to check for zlib.
(IT_CHECK_FOR_JPEG): Likewise for libjpeg.
(IT_CHECK_FOR_PNG): Likewise for libpng.
(IT_CHECK_FOR_GIF): Likewise for giflib.
* configure.ac:
Remove old AC_CHECK_LIB calls for jpeg, gif
and zlib and PKG_CHECK_MODULES call for libpng.
Add calls to new macros above.
* remove-intree-libraries.sh.in:
Make removal of zlib, libpng, giflib and libjpeg
files dependent on whether or not the system versions
are used (the default).
changeset a87a9bd497fd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a87a9bd497fd
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 10:46:18 2013 +0000
Touch $@ instead of explicit stamp name throughout.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(hgforest): Use $@ for stamp name.
(download-openjdk): Likewise.
(download-hotspot): Likewise.
(download): Likewise.
(extract-openjdk): Likewise.
(extract-jamvm): Likewise.
(replace-hotspot): Likewise.
(ports): Likewise.
(remove-intree-libraries): Likewise.
(generated): Likewise.
(fonts): Likewise.
(patch-fsg): Likewise.
(patch): Likewise.
(overlay): Likewise.
(extract-ecj): Likewise.
(patch-ecj): Likewise.
(native-ecj): Likewise.
(bootstrap-directory-ecj): Likewise.
(bootstrap-directory): Likewise.
(bootstrap-directory-symlink-ecj): Likewise.
(bootstrap-directory-symlink): Likewise.
(icedtea): Likewise.
(icedtea-debug): Likewise.
(icedtea-against-icedtea): Likewise.
(icedtea-debug-against-icedtea): Likewise.
(add-systemtap): Likewise.
(add-systemtap-debug): Likewise.
(add-pulseaudio): Likewise.
(add-pulseaudio-debug): Likewise.
(add-nss): Likewise.
(add-nss-debug): Likewise.
(add-tzdata-support): Likewise.
(add-tzdata-support-debug): Likewise.
(add-archive): Likewise.
(add-archive-debug): Likewise.
(check-crypto-debug): Add missing stamp.
(icedtea-ecj): Use $@ for stamp name.
(icedtea-against-ecj): Likewise.
(add-systemtap-ecj): Likewise.
(add-pulseaudio-ecj): Likewise.
(add-nss-ecj): Likewise.
(add-tzdata-support-ecj): Likewise.
(add-archive-ecj): Likewise.
(pulse-java): Likewise.
(pulse-java-jar): Likewise.
(pulse-java-class): Likewise.
(pulse-java-headers): Likewise.
(rewriter): Likewise.
(rewrite-rhino): Likewise.
(rt-class-files): Likewise.
(rt): Likewise.
changeset 21b6a3bc507d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=21b6a3bc507d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:13:18 2013 +0100
Enable system LCMS only if 2.5 or above is available.
2013-07-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Turn system LCMS on by
default if the version is 2.5 or above with the
latest security fixes.
changeset ce7127f0a2f4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ce7127f0a2f4
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:18:18 2013 +0100
Make LCMS error message mention version required.
2013-09-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Make error message mention
version.
changeset d090d5e3c4aa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d090d5e3c4aa
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 10:53:52 2013 +0000
Always quote using '[' and ']' in macro calls.
2011-09-27 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
Always quote using '[' and ']' in macro calls.
(IT_CHECK_FOR_GIF): Replace quotation marks
with '[' and ']'.
* configure.ac:
Same for CUPS and X.org checks.
diffstat:
ChangeLog | 139 +
Makefile.am | 159 +-
NEWS | 1 +
acinclude.m4 | 107 +-
configure.ac | 35 +-
patches/alternative_krb5_cache_fixup.patch | 2 +-
patches/libraries-gif.patch | 12 +
patches/libraries-jpeg.patch | 917 ++++++
patches/libraries-png.patch | 12 +
patches/libraries-splashscreen.patch | 104 +
patches/libraries-zlib.patch | 253 +
patches/libraries.patch | 1312 ----------
patches/linker-libs-order-zlib.patch | 33 +
patches/linker-libs-order.patch | 30 -
patches/openjdk/lcms2/system_lcms2.patch | 4 +-
patches/rh661505-jpeg-nosys.patch | 16 +
patches/security/20130618/8009071-improve_shape_handling.patch | 128 +-
remove-intree-libraries.sh.in | 137 +-
18 files changed, 1850 insertions(+), 1551 deletions(-)
diffs (truncated from 4158 to 500 lines):
diff -r 74aaf8c87752 -r d090d5e3c4aa ChangeLog
--- a/ChangeLog Fri Dec 20 11:06:38 2013 +0100
+++ b/ChangeLog Thu Dec 26 10:53:52 2013 +0000
@@ -1,3 +1,142 @@
+2011-09-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ Always quote using '[' and ']' in macro calls.
+ (IT_CHECK_FOR_GIF): Replace quotation marks
+ with '[' and ']'.
+ * configure.ac:
+ Same for CUPS and X.org checks.
+
+2013-09-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Make error message mention
+ version.
+
+2013-07-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Turn system LCMS on by
+ default if the version is 2.5 or above with the
+ latest security fixes.
+
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (hgforest): Use $@ for stamp name.
+ (download-openjdk): Likewise.
+ (download-hotspot): Likewise.
+ (download): Likewise.
+ (extract-openjdk): Likewise.
+ (extract-jamvm): Likewise.
+ (replace-hotspot): Likewise.
+ (ports): Likewise.
+ (remove-intree-libraries): Likewise.
+ (generated): Likewise.
+ (fonts): Likewise.
+ (patch-fsg): Likewise.
+ (patch): Likewise.
+ (overlay): Likewise.
+ (extract-ecj): Likewise.
+ (patch-ecj): Likewise.
+ (native-ecj): Likewise.
+ (bootstrap-directory-ecj): Likewise.
+ (bootstrap-directory): Likewise.
+ (bootstrap-directory-symlink-ecj): Likewise.
+ (bootstrap-directory-symlink): Likewise.
+ (icedtea): Likewise.
+ (icedtea-debug): Likewise.
+ (icedtea-against-icedtea): Likewise.
+ (icedtea-debug-against-icedtea): Likewise.
+ (add-systemtap): Likewise.
+ (add-systemtap-debug): Likewise.
+ (add-pulseaudio): Likewise.
+ (add-pulseaudio-debug): Likewise.
+ (add-nss): Likewise.
+ (add-nss-debug): Likewise.
+ (add-tzdata-support): Likewise.
+ (add-tzdata-support-debug): Likewise.
+ (add-archive): Likewise.
+ (add-archive-debug): Likewise.
+ (check-crypto-debug): Add missing stamp.
+ (icedtea-ecj): Use $@ for stamp name.
+ (icedtea-against-ecj): Likewise.
+ (add-systemtap-ecj): Likewise.
+ (add-pulseaudio-ecj): Likewise.
+ (add-nss-ecj): Likewise.
+ (add-tzdata-support-ecj): Likewise.
+ (add-archive-ecj): Likewise.
+ (pulse-java): Likewise.
+ (pulse-java-jar): Likewise.
+ (pulse-java-class): Likewise.
+ (pulse-java-headers): Likewise.
+ (rewriter): Likewise.
+ (rewrite-rhino): Likewise.
+ (rt-class-files): Likewise.
+ (rt): Likewise.
+
+2013-12-24 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1630: Make system JPEG/Zlib/PNG/GIF support
+ optional
+ * patches/alternative_krb5_cache_fixup.patch:
+ Replace USE_SYSTEM_LCMS with SYSTEM_LCMS.
+ * patches/libraries-gif.patch: Split out
+ from libraries.patch.
+ * patches/libraries-jpeg.patch: Likewise.
+ * patches/libraries-png.patch: Likewise.
+ * patches/libraries-splashscreen.patch:
+ Rewritten using SYSTEM_{PNG,GIF,ZLIB,JPEG} flags.
+ * patches/libraries-zlib.patch:
+ Split out from libraries.patch.
+ * patches/linker-libs-order-zlib.patch:
+ Split out from linker-libs-order.patch. Only
+ applies if system zlib is being used.
+ * patches/linker-libs-order.patch:
+ Move system-zlib-specific parts to separate file.
+ * patches/openjdk/lcms2/system_lcms2.patch:
+ Replace USE_SYSTEM_LCMS with SYSTEM_LCMS.
+ * patches/rh661505-jpeg-nosys.patch:
+ New version that uses function calls appropriate for
+ the in-tree version.
+ * patches/security/20130618/8009071-improve_shape_handling.patch:
+ Regenerated as now applied before libraries-gif.patch,
+ which may or may not be applied.
+
+2011-09-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/libraries.patch:
+ Split into parts for individual libraries.
+ Splashscreen parts rewritten.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Replace libraries.patch
+ with libraries-splashscreen.patch. Apply
+ other library patches depending on which
+ system libraries are used and which aren't.
+ Use a different version of the RH661505
+ patch, depending on whether the system
+ or in-tree JPEG library is used.
+ (ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS,
+ SYSTEM_ZLIB, JPEG_LIBS, JPEG_CFLAGS,
+ SYSTEM_JPEG, PNG_LIBS, PNG_CFLAGS,
+ SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS,
+ SYSTEM_GIF. Replace USE_SYSTEM_LCMS with
+ SYSTEM_LCMS for consistency.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_ZLIB): New macro to check for zlib.
+ (IT_CHECK_FOR_JPEG): Likewise for libjpeg.
+ (IT_CHECK_FOR_PNG): Likewise for libpng.
+ (IT_CHECK_FOR_GIF): Likewise for giflib.
+ * configure.ac:
+ Remove old AC_CHECK_LIB calls for jpeg, gif
+ and zlib and PKG_CHECK_MODULES call for libpng.
+ Add calls to new macros above.
+ * remove-intree-libraries.sh.in:
+ Make removal of zlib, libpng, giflib and libjpeg
+ files dependent on whether or not the system versions
+ are used (the default).
+
2013-12-20 Xerxes RÃ¥nby <xerxes at zafena.se>
Robert Lougher <rob at jamvm.org.uk>
diff -r 74aaf8c87752 -r d090d5e3c4aa Makefile.am
--- a/Makefile.am Fri Dec 20 11:06:38 2013 +0100
+++ b/Makefile.am Thu Dec 26 10:53:52 2013 +0000
@@ -355,7 +355,7 @@
patches/use-system-tzdata.patch \
patches/headers.patch \
patches/gcc-suffix.patch \
- patches/libraries.patch \
+ patches/libraries-splashscreen.patch \
$(SPECIAL_SECURITY_PATCH_2) \
patches/uname.patch \
patches/nomotif-6706121.patch \
@@ -401,7 +401,6 @@
patches/openjdk/7003777-bad-html-entity-parse.patch \
patches/rendering-engine-tests.patch \
patches/openjdk/6800846-printing-quality.patch \
- patches/rh661505-jpeg.patch \
patches/6703377-freetypescaler.patch \
patches/openjdk/6642612-filechooser_button_sizes.patch \
patches/jtreg-international-fonts-styles.patch \
@@ -681,6 +680,30 @@
patches/pax-mark-rmic-java.patch
endif
+if USE_SYSTEM_ZLIB
+ICEDTEA_PATCHES += \
+ patches/libraries-zlib.patch \
+ patches/linker-libs-order-zlib.patch
+endif
+
+if USE_SYSTEM_JPEG
+ICEDTEA_PATCHES += \
+ patches/libraries-jpeg.patch \
+ patches/rh661505-jpeg.patch
+else
+ patches/rh661505-jpeg-nosys.patch
+endif
+
+if USE_SYSTEM_PNG
+ICEDTEA_PATCHES += \
+ patches/libraries-png.patch
+endif
+
+if USE_SYSTEM_GIF
+ICEDTEA_PATCHES += \
+ patches/libraries-gif.patch
+endif
+
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -838,13 +861,41 @@
RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
endif
+if USE_SYSTEM_ZLIB
+ICEDTEA_ENV += \
+ SYSTEM_ZLIB="true" \
+ ZLIB_LIBS="${ZLIB_LIBS}" \
+ ZLIB_CFLAGS="${ZLIB_CFLAGS}"
+endif
+
if USE_SYSTEM_LCMS
ICEDTEA_ENV += \
- USE_SYSTEM_LCMS="true" \
+ SYSTEM_LCMS="true" \
LCMS_LIBS="${LCMS2_LIBS}" \
LCMS_CFLAGS="${LCMS2_CFLAGS}"
endif
+if USE_SYSTEM_JPEG
+ICEDTEA_ENV += \
+ SYSTEM_JPEG="true" \
+ JPEG_LIBS="${JPEG_LIBS}" \
+ JPEG_CFLAGS="${JPEG_CFLAGS}"
+endif
+
+if USE_SYSTEM_PNG
+ICEDTEA_ENV += \
+ SYSTEM_PNG="true" \
+ PNG_LIBS="${PNG_LIBS}" \
+ PNG_CFLAGS="${PNG_CFLAGS}"
+endif
+
+if USE_SYSTEM_GIF
+ICEDTEA_ENV += \
+ SYSTEM_GIF="true" \
+ GIF_LIBS="${GIF_LIBS}" \
+ GIF_CFLAGS="${GIF_CFLAGS}"
+endif
+
if USE_SYSTEM_KERBEROS
ICEDTEA_ENV += \
SYSTEM_KRB5="true" \
@@ -996,7 +1047,7 @@
fi;
endif
mkdir -p stamps
- touch stamps/hgforest.stamp
+ touch $@
clean-hgforest:
rm -f stamps/hgforest.stamp
@@ -1096,7 +1147,7 @@
endif
endif
mkdir -p stamps
- touch stamps/download-openjdk.stamp
+ touch $@
clean-download-openjdk:
rm -f $(OPENJDK_SRC_ZIP)
@@ -1130,7 +1181,7 @@
fi
endif
mkdir -p stamps
- touch stamps/download-hotspot.stamp
+ touch $@
clean-download-hotspot:
rm -f $(HOTSPOT_SRC_ZIP)
@@ -1138,7 +1189,7 @@
stamps/download.stamp: stamps/download-cacao.stamp stamps/download-jamvm.stamp \
stamps/download-openjdk.stamp stamps/download-hotspot.stamp
- touch stamps/download.stamp
+ touch $@
clean-download: clean-download-cacao clean-download-jamvm \
clean-download-openjdk clean-download-hotspot
@@ -1184,7 +1235,7 @@
cp jvm.jamvm.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
endif
mkdir -p stamps
- touch stamps/extract-openjdk.stamp
+ touch $@
clean-extract-openjdk:
rm -rf openjdk
@@ -1229,7 +1280,7 @@
fi
endif
mkdir -p stamps
- touch stamps/extract-jamvm.stamp
+ touch $@
stamps/replace-hotspot.stamp: stamps/extract.stamp
if WITH_ALT_HSBUILD
@@ -1247,7 +1298,7 @@
fi ;
endif
mkdir -p stamps
- touch stamps/replace-hotspot.stamp
+ touch $@
clean-replace-hotspot:
rm -f stamps/replace-hotspot.stamp
@@ -1261,7 +1312,7 @@
chmod -R ug+rwX $$link; \
done
mkdir -p stamps
- touch stamps/ports.stamp
+ touch $@
clean-ports:
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
@@ -1273,7 +1324,7 @@
stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp
sh $(abs_top_builddir)/remove-intree-libraries.sh
- touch stamps/remove-intree-librares.stamp
+ touch $@
clean-remove-intree-libraries:
rm -f stamps/remove-intree-libraries.stamp
@@ -1284,7 +1335,7 @@
chmod -R ug+rwX $(GENERATED_BUILD_DIR) ; \
fi
mkdir -p stamps
- touch stamps/generated.stamp
+ touch $@
clean-generated:
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
@@ -1298,7 +1349,7 @@
cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.11.properties
cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties
mkdir -p stamps
- touch stamps/fonts.stamp
+ touch $@
clean-fonts:
rm -f stamps/fonts.stamp
@@ -1327,7 +1378,7 @@
test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
fi ; \
done ; \
- mv stamps/patch-fsg.stamp.tmp stamps/patch-fsg.stamp ; \
+ mv stamps/patch-fsg.stamp.tmp $@ ; \
if ! test x$${all_patches_ok} = "xyes"; then \
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
@@ -1376,7 +1427,7 @@
test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
fi ; \
done ; \
- mv stamps/patch.stamp.tmp stamps/patch.stamp ; \
+ mv stamps/patch.stamp.tmp $@ ; \
if ! test x$${all_patches_ok} = "xyes"; then \
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
@@ -1432,7 +1483,7 @@
cp -a overlays.build/openjdk/* openjdk/
cp -a overlays.build/jpeg/openjdk/* openjdk/
rm -rf overlays.build
- touch stamps/overlay.stamp
+ touch $@
clean-overlay:
rm -f stamps/overlay.stamp
@@ -1447,7 +1498,7 @@
cp -pPRl openjdk openjdk-ecj ; \
fi
mkdir -p stamps
- touch stamps/extract-ecj.stamp
+ touch $@
# FIXME (missing): Rename to clean-clone-ecj.
clean-extract-ecj:
@@ -1481,7 +1532,7 @@
test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
fi ; \
done ; \
- mv stamps/patch-ecj.stamp.tmp stamps/patch-ecj.stamp ; \
+ mv stamps/patch-ecj.stamp.tmp $@ ; \
if ! test x$${all_patches_ok} = "xyes"; then \
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
@@ -1515,7 +1566,7 @@
$(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
--main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
fi ; \
- touch stamps/native-ecj.stamp
+ touch $@
clean-native-ecj:
rm -f native-ecj
@@ -1551,7 +1602,7 @@
mkdir -p $(ECJ_BOOT_DIR)/lib && \
ln -sf $(ECJ_BOOT_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/lib/tools.jar
mkdir -p stamps
- touch stamps/bootstrap-directory-ecj.stamp
+ touch $@
clean-bootstrap-directory-ecj:
rm -rf $(ECJ_BOOT_DIR)
@@ -1566,7 +1617,7 @@
ln -sf $(ECJ_BUILD_OUTPUT_DIR)/include $(ICEDTEA_BOOT_DIR)/include; \
fi
mkdir -p stamps
- touch stamps/bootstrap-directory.stamp
+ touch $@
clean-bootstrap-directory:
rm -rf $(ICEDTEA_BOOT_DIR)
@@ -1577,7 +1628,7 @@
rm -f $(BOOT_DIR)
ln -sf $(ECJ_BOOT_DIR) $(BOOT_DIR)
mkdir -p stamps
- touch stamps/bootstrap-directory-symlink-ecj.stamp
+ touch $@
clean-bootstrap-directory-symlink-ecj:
rm -f $(BOOT_DIR)
@@ -1595,7 +1646,7 @@
exit 1; \
fi
mkdir -p stamps
- touch stamps/bootstrap-directory-symlink.stamp
+ touch $@
clean-bootstrap-directory-symlink:
rm -f $(BOOT_DIR)
@@ -1631,7 +1682,7 @@
endif
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
mkdir -p stamps
- touch stamps/icedtea.stamp
+ touch $@
clean-icedtea:
rm -rf $(BUILD_OUTPUT_DIR)
@@ -1663,7 +1714,7 @@
@echo "IcedTea (debug build) is served:" \
$(DEBUG_BUILD_OUTPUT_DIR)
mkdir -p stamps
- touch stamps/icedtea-debug.stamp
+ touch $@
clean-icedtea-debug:
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
@@ -1675,7 +1726,7 @@
stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp \
stamps/check-crypto.stamp
mkdir -p stamps
- touch stamps/icedtea-against-icedtea.stamp
+ touch $@
clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
@@ -1688,7 +1739,7 @@
stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
stamps/pax-mark-vm-debug.stamp stamps/check-crypto-debug.stamp
mkdir -p stamps
- touch stamps/icedtea-debug-against-icedtea.stamp
+ touch $@
clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
@@ -1719,7 +1770,7 @@
cp $(abs_top_builddir)/tapset/jstack.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
- touch stamps/add-systemtap.stamp
+ touch $@
clean-add-systemtap:
rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
@@ -1747,7 +1798,7 @@
cp $(abs_top_builddir)/tapset/jstack.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
- touch stamps/add-systemtap-debug.stamp
+ touch $@
clean-add-systemtap-debug:
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
@@ -1766,7 +1817,7 @@
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
- touch stamps/add-pulseaudio.stamp
+ touch $@
# Note: for simplicity, we don't revert the update of src.zip
clean-add-pulseaudio:
@@ -1789,7 +1840,7 @@
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
- touch stamps/add-pulseaudio-debug.stamp
+ touch $@
# Note: for simplicity, we don't revert the update of src.zip
More information about the distro-pkg-dev
mailing list