Source: libtool
Version: 2.4.2-1.6
Severity: wishlist
Tags: patch
As part of the bootstrapping process, one needs to be able to build libtool
before the somewhat heavier depedency chains of texinfo and texi2html become
available. The attached patch should make this possible by moving those
dependencies into Build-Depends-Indep. (Of course, one will also need to
build without gfortran being installable at such an early stage, but this
isn't really an issue.)
--
Daniel Schepler
diff -urN libtool-2.4.2.old/debian/control libtool-2.4.2/debian/control
--- libtool-2.4.2.old/debian/control 2014-01-01 15:19:31.000000000 -0800
+++ libtool-2.4.2/debian/control 2014-02-06 18:41:35.216281447 -0800
@@ -1,5 +1,6 @@
Source: libtool
-Build-Depends: debhelper (>= 8.1.3~), texi2html, texinfo, file, gfortran | fortran95-compiler, automake (>= 1:1.11.1), autoconf (>= 2.62), autotools-dev, help2man, zlib1g-dev
+Build-Depends: debhelper (>= 8.1.3~), file, gfortran | fortran95-compiler, automake (>= 1:1.11.1), autoconf (>= 2.62), autotools-dev, help2man, zlib1g-dev
+Build-Depends-Indep: texi2html, texinfo
Build-Conflicts: automake1.9, gcj-jdk
Section: devel
Priority: optional
diff -urN libtool-2.4.2.old/debian/rules libtool-2.4.2/debian/rules
--- libtool-2.4.2.old/debian/rules 2011-10-29 11:09:59.000000000 -0700
+++ libtool-2.4.2/debian/rules 2014-02-06 18:53:34.823823994 -0800
@@ -7,6 +7,13 @@
DEBIAN_REVISION=$(strip $(shell dpkg-parsechangelog | awk -F: '/^Version:/ {print $$NF}'))
+# if doing a binary-arch build, the Makefiles still want to update the
+# info files; force them not to
+ifeq (,$(wildcard /usr/bin/makeinfo))
+MAKEINFO=true
+export MAKEINFO
+endif
+
# libltdl needs to conform to policy
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -43,7 +50,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp config-stamp
+ rm -f build-stamp build-indep-stamp config-stamp
dh_clean
[ ! -f Makefile ] || $(MAKE) -k distclean
@@ -85,7 +92,9 @@
touch config-stamp
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
build-stamp: config-stamp
dh_testdir
@@ -128,10 +137,6 @@
# Make libtool executable again
chmod 755 libtool
-# This generated HTML page goes into libtool-doc.
- cd doc && makeinfo libtool.texi
- cd doc && texi2html -monolithic libtool.texi
-
ifeq ($(make_check), yes)
# Now make sure it works
@@ -143,7 +148,15 @@
touch build-stamp
-install: build
+build-indep: build-indep-stamp
+build-indep-stamp:
+# This generated HTML page goes into libtool-doc.
+ cd doc && makeinfo libtool.texi
+ cd doc && texi2html -monolithic libtool.texi
+
+ touch build-indep-stamp
+
+install: build-arch
dh_testdir
dh_testroot
dh_prep
@@ -152,7 +165,7 @@
$(MAKE) prefix=`pwd`/debian/tmp/usr install
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
dh_testdir -i
dh_testroot -i
@@ -171,7 +184,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir -a
dh_testroot -a
@@ -202,4 +215,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean config patch unpatch binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean config patch unpatch binary-indep binary-arch binary install
