I've prepared an NMU for cross-build support in acl (versioned as 2.2.47-2.1) and I plan to upload it to DELAYED/7. Please free to tell me if I should delay it longer.
http://lists.debian.org/debian-devel/2009/05/msg00769.html This a replacement patch for the original posted to this bug report - it is simpler but it does introduce dpatch as a patch system. The main purposes of the patch are: 1. Implement --build and --host support in debian/rules as advised in /usr/share/doc/autotools-dev/README.Debian.gz 2. Migrate to a modifiable libtool script instead of /usr/bin/libtool so that cross-builds can get the right compiler and tag settings. As part of the dpatch addition, I've also migrated Kurt's patch for #477515 into a dpatch patch. This keeps all changes within the debian/ directory. As the NMU introduces new build-depends and a new patch system, I'll wait 7 days before uploading to the DELAYED/7 queue. Regards. -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
reverted: --- acl-2.2.47/Makefile +++ acl-2.2.47.orig/Makefile @@ -41,6 +41,7 @@ --bindir=/usr/bin \ --libdir=/lib \ --libexecdir=/usr/lib \ + --enable-lib64=yes \ --includedir=/usr/include \ --mandir=/usr/share/man \ --datadir=/usr/share \ diff -u acl-2.2.47/debian/changelog acl-2.2.47/debian/changelog --- acl-2.2.47/debian/changelog +++ acl-2.2.47/debian/changelog @@ -1,3 +1,16 @@ +acl (2.2.47-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add dpatch support for upstream changes + * Add AC_PROG_LIBTOOL to configure.in - Cross-build needs a modifiable + libtool script. + * Patch builddefs to look for local libtool script. + * Migrate Kurt's fix for 477515 into a patch. + * Add automake to build-depends for aclocal support. + * Add cross build and libtool support (Closes: #284167) + + -- Neil Williams <[email protected]> Wed, 27 May 2009 14:38:45 +0100 + acl (2.2.47-2) unstable; urgency=low * Acknowledge NMU. Closes: Closes: #477515 diff -u acl-2.2.47/debian/control acl-2.2.47/debian/control --- acl-2.2.47/debian/control +++ acl-2.2.47/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Nathan Scott <[email protected]> Uploaders: Anibal Monsalve Salazar <[email protected]> -Build-Depends: autoconf, debhelper (>= 5), gettext, libtool, libattr1-dev (>= 2.4.4) +Build-Depends: autoconf, automake, debhelper (>= 5), dpatch, gettext, libtool, libattr1-dev (>= 2.4.4) Standards-Version: 3.7.3 Homepage: http://oss.sgi.com/projects/xfs/ diff -u acl-2.2.47/debian/rules acl-2.2.47/debian/rules --- acl-2.2.47/debian/rules +++ acl-2.2.47/debian/rules @@ -2,6 +2,13 @@ export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make +DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + package = acl develop = lib$(package)1-dev library = lib$(package)1 @@ -15,11 +22,12 @@ stdenv = @GZIP=-q; export GZIP; options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ - INSTALL_USER=root INSTALL_GROUP=root ; + INSTALL_USER=root INSTALL_GROUP=root LOCAL_CONFIGURE_OPTIONS="$(CROSS)"; checkdir = test -f debian/rules -build: built -built: config +build: build-stamp +build-stamp: built +built: patch-stamp config @echo "== dpkg-buildpackage: build" 1>&2 $(MAKE) default cd po; rm -rf acl.pot; make acl.pot @@ -29,16 +37,26 @@ .census: @echo "== dpkg-buildpackage: configure" 1>&2 $(checkdir) +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + libtoolize -f + aclocal -I m4 $(options) $(MAKE) configure touch .census -clean: +clean: unpatch @echo "== dpkg-buildpackage: clean" 1>&2 $(checkdir) -rm -f built .census $(MAKE) distclean -rm -rf $(dirme) $(dirdev) $(dirlib) -rm -f debian/*substvars debian/files* debian/*.debhelper + $(RM) config.sub config.guess ltmain.sh aclocal.m4 libtool + dh_clean binary-indep: only in patch2: unchanged: --- acl-2.2.47.orig/debian/patches/010-libtool-configure.dpatch +++ acl-2.2.47/debian/patches/010-libtool-configure.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 010-libtool-configure.dpatch by Neil Williams <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cross-build needs a modifiable libtool script, not /usr/bin/ + +...@dpatch@ +diff -urNad acl-2.2.47.debian~/configure.in acl-2.2.47.debian/configure.in +--- acl-2.2.47.debian~/configure.in 2007-09-11 03:00:47.000000000 +0100 ++++ acl-2.2.47.debian/configure.in 2009-05-27 14:18:00.000000000 +0100 +@@ -1,7 +1,7 @@ + AC_INIT(include/acl.h) + AC_CONFIG_HEADER(include/config.h) + AC_PREFIX_DEFAULT(/usr) +- ++AC_PROG_LIBTOOL + AC_ARG_ENABLE(shared, + [ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, + enable_shared=yes) only in patch2: unchanged: --- acl-2.2.47.orig/debian/patches/020-builddefs.dpatch +++ acl-2.2.47/debian/patches/020-builddefs.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 020-builddefs.dpatch by Neil Williams <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow libtool script to be found in top_builddir + +...@dpatch@ +diff -urNad acl-2.2.47.debian~/include/builddefs.in acl-2.2.47.debian/include/builddefs.in +--- acl-2.2.47.debian~/include/builddefs.in 2007-09-11 03:00:47.000000000 +0100 ++++ acl-2.2.47.debian/include/builddefs.in 2009-05-27 14:18:43.000000000 +0100 +@@ -4,6 +4,8 @@ + # @configure_input@ + # + ++top_builddir = @top_builddir@ ++ + ifndef _BUILDDEFS_INCLUDED_ + _BUILDDEFS_INCLUDED_ = 1 + only in patch2: unchanged: --- acl-2.2.47.orig/debian/patches/00list +++ acl-2.2.47/debian/patches/00list @@ -0,0 +1,3 @@ +010-libtool-configure.dpatch +020-builddefs.dpatch +030-remove-lib64.dpatch only in patch2: unchanged: --- acl-2.2.47.orig/debian/patches/030-remove-lib64.dpatch +++ acl-2.2.47/debian/patches/030-remove-lib64.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 030-remove-lib64.dpatch by Neil Williams <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Convert Kurt's fix for 477515 into a dpatch patch. + +...@dpatch@ +diff -urNad acl-2.2.47.debian~/Makefile acl-2.2.47.debian/Makefile +--- acl-2.2.47.debian~/Makefile 2009-05-27 14:28:44.000000000 +0100 ++++ acl-2.2.47.debian/Makefile 2009-05-27 14:29:01.000000000 +0100 +@@ -41,7 +41,6 @@ + --bindir=/usr/bin \ + --libdir=/lib \ + --libexecdir=/usr/lib \ +- --enable-lib64=yes \ + --includedir=/usr/include \ + --mandir=/usr/share/man \ + --datadir=/usr/share \
pgpcuUQed3qow.pgp
Description: PGP signature
