Mercurial > hg > release > icedtea6-1.3
changeset 82:9176dcb9498f
2007-07-11 Andrew Haley <aph@redhat.com>
* Makefile.am (patch): Set fuzziness to zero.
| author | Andrew Haley <aph@redhat.com> |
|---|---|
| date | Wed, 11 Jul 2007 19:10:19 +0100 |
| parents | 6b3987f26dce |
| children | b639d73581e3 |
| files | ChangeLog Makefile.am Makefile.in patches/icedtea-ecj-bootstrap.patch |
| diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 11 18:43:31 2007 +0100 +++ b/ChangeLog Wed Jul 11 19:10:19 2007 +0100 @@ -1,8 +1,12 @@ +2007-07-11 Andrew Haley <aph@redhat.com> + + * Makefile.am (patch): Set fuzziness to zero. + 2007-07-11 Andrew Haley <aph@redhat.com> * patches/icedtea-assembler_amd64.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add icedtea-assembler_amd64.patch. - (cedtea-debug): New target + (icedtea-debug): New target 2007-07-08 Mark Wielaard <mark@klomp.org>
--- a/Makefile.am Wed Jul 11 18:43:31 2007 +0100 +++ b/Makefile.am Wed Jul 11 19:10:19 2007 +0100 @@ -264,7 +264,7 @@ for p in $(ICEDTEA_PATCHES) ; \ do \ echo Checking $$p ; \ - if $(PATCH) -p0 --dry-run -s -t -f < $$p ; \ + if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \ then \ echo Applying $$p ; \ $(PATCH) -p0 < $$p ; \
--- a/Makefile.in Wed Jul 11 18:43:31 2007 +0100 +++ b/Makefile.in Wed Jul 11 19:10:19 2007 +0100 @@ -690,7 +690,7 @@ for p in $(ICEDTEA_PATCHES) ; \ do \ echo Checking $$p ; \ - if $(PATCH) -p0 --dry-run -s -t -f < $$p ; \ + if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \ then \ echo Applying $$p ; \ $(PATCH) -p0 < $$p ; \ @@ -834,7 +834,7 @@ $(MAKE) debug_build \ $(ICEDTEA_ENV) \ -C openjdk/control/make - @echo "IcedTea is served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR) + @echo "IcedTea is served:" openjdk/control/build/linux-$(BUILD_ARCH_DIR)-debug snapshot: dist mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
--- a/patches/icedtea-ecj-bootstrap.patch Wed Jul 11 18:43:31 2007 +0100 +++ b/patches/icedtea-ecj-bootstrap.patch Wed Jul 11 19:10:19 2007 +0100 @@ -98,8 +98,8 @@ -d $(CLASSHDRDIR)/ \ $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) @$(java-vm-cleanup) -+ -mv $(ICEDTEA_BUILD_DIR)/tmp/java/java.lang/java/CClassHeaders/java_lang_ClassLoader\$$NativeLibrary.h \ -+ $(ICEDTEA_BUILD_DIR)/tmp/java/java.lang/java/CClassHeaders/java_lang_ClassLoader_NativeLibrary.h ++ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \ ++ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h @$(TOUCH) $@ classheaders.clean: