openjdk team mailing list archive

[Hideki Yamane <henrich@xxxxxxxxxxxx>]

Control: tags -1 +patch

Hi,

 Attached simple patch would fix this FTBFS, could you check and consider
 to apply it, please?


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane

diff -u openjdk-7-7u25-2.3.12/debian/changelog openjdk-7-7u25-2.3.12/debian/changelog
--- openjdk-7-7u25-2.3.12/debian/changelog
+++ openjdk-7-7u25-2.3.12/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-7 (7u25-2.3.12-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - run autoreconf, instead of aclocal, automake and autoconf (Closes: #724083)
+
+ -- Hideki Yamane <henrich@xxxxxxxxxx>  Wed, 23 Oct 2013 19:14:39 +0900
+
 openjdk-7 (7u25-2.3.12-4) unstable; urgency=low
 
   * Add the hotspot patches for AArch64, which apparently were not
diff -u openjdk-7-7u25-2.3.12/debian/rules openjdk-7-7u25-2.3.12/debian/rules
--- openjdk-7-7u25-2.3.12/debian/rules
+++ openjdk-7-7u25-2.3.12/debian/rules
@@ -1067,6 +1067,7 @@
 
 	mkdir -p stamps
 	mkdir -p build
+	autoreconf -fi
 	chmod +x configure
 	cd build && $(EXTRA_BUILD_ENV) ../configure $(CONFIGURE_ARGS)
 
@@ -1261,9 +1262,7 @@
 ifeq ($(with_mauve_check),yes)
 	tar -x -C build -f /usr/src/mauve.tar.gz
 	cd build/mauve \
-	    && aclocal \
-	    && automake \
-	    && autoconf \
+	    && autoreconf -fi \
 	    && PATH=$(CURDIR)/build/$(sdkimg)/bin:$$PATH \
 		./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 	PATH=$(CURDIR)/build/$(sdkimg)/bin:$$PATH $(MAKE) -C build/mauve
@@ -1278,9 +1277,7 @@
 	tar -x -C build -f /usr/src/mauve.tar.gz
 	mv build/mauve build/mauve-$(VMNAME)
 	cd build/mauve-$(VMNAME) \
-	    && aclocal \
-	    && automake \
-	    && autoconf \
+	    && autoreconf -fi \
 	    && PATH=$(CURDIR)/build/$(sdkimg)/bin:$$PATH ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 	PATH=$(CURDIR)/build/$(sdkimg)/bin:$$PATH $(MAKE) -C build/mauve-$(VMNAME)