[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-205-g773e6dc
The following commit has been merged in the master branch: commit 773e6dcc0e8fcbd0f185f95d27184e9979a2411e Author: Guillem Jover Date: Sat Jul 30 18:35:03 2011 +0200 build: Error out if the host dpkg architecture cannot be determined Continuing will only produce a buggy dpkg. diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index b94a883..8a490fa 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -57,7 +57,11 @@ AC_DEFUN([DPKG_ARCHITECTURE], DPKG_OS_TYPE AC_MSG_CHECKING([dpkg architecture name]) _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch]) -AC_MSG_RESULT([$dpkg_arch]) +if test "x$dpkg_arch" = "x"; then + AC_MSG_ERROR([cannot determine host dpkg architecture]) +else + AC_MSG_RESULT([$dpkg_arch]) +fi AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_arch}", [Set this to the canonical dpkg architecture name.]) ])# DPKG_ARCHITECTURE -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-205-g773e6dc
The following commit has been merged in the master branch: commit c90b620cd8c2836a3f5058dfa1527f9d7b5cf46e Author: Guillem Jover Date: Sat Jul 30 18:14:27 2011 +0200 build: Move DPKG_ARCHITECTURE macro call to the end This puts together all build machinery checks, and will allow DPKG_ARCHITECTURE to use the detected perl interpreter w/o needing to call DPKG_PROG_PERL really early in the configure script. diff --git a/configure.ac b/configure.ac index 8079f36..c844b3b 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,6 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_USE_SYSTEM_EXTENSIONS -DPKG_ARCHITECTURE AM_INIT_AUTOMAKE([1.8 foreign nostdinc]) @@ -89,10 +88,12 @@ AC_CHECK_FUNCS([strtoul strtoimax isascii bcopy memcpy setsid getdtablesize \ DPKG_MMAP +# Checks for the build machinery. AC_DEFINE(LIBDPKG_VOLATILE_API, 1, [Acknowledge the volatility of the API.]) DPKG_COMPILER_WARNINGS DPKG_COMPILER_OPTIMISATIONS DPKG_LINKER_OPTIMISATIONS +DPKG_ARCHITECTURE AC_CONFIG_FILES([ Makefile dpkg-deb/Makefile -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-205-g773e6dc
The following commit has been merged in the master branch: commit 99b890c2eb6bfe955d85aedd40841366826c2f73 Author: Guillem Jover Date: Sat Jul 30 18:27:39 2011 +0200 build: Use the detected perl to invoke dpkg-architecture.pl This will help building dpkg on systems where perl is not at /usr/bin/perl, which we were already taking into consideration for the resulting scripts but not during build. diff --git a/debian/changelog b/debian/changelog index e8069ad..4ee6e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -165,6 +165,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low * Unify somewhat dpkg-maintscript-helper --help output with other commands. * Add build-indep and build-arch targets as aliases for build in debian/rules. + * Use the perl interpreter found by configure to call dpkg-architecture.pl +in the m4 DPKG_ARCHITECTURE macro. * Fix possible segfault of dpkg in findbreakcycle(). LP: #733414 [ Bill Allombert] diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index ddeeae0..b94a883 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -6,9 +6,10 @@ # Use dpkg-architecture from the source tree to set sh_var using DEB_VAR for # the target architecture, to avoid duplicating its logic. AC_DEFUN([_DPKG_ARCHITECTURE], [ +AC_REQUIRE([DPKG_PROG_PERL])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl $2=$(cd $srcdir/scripts; \ -PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null) +PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null) ])# _DPKG_ARCHITECURE # DPKG_CPU_TYPE -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org