debian/changelog | 8 ++++++++
debian/rules | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3075be29786a279b856dc0d6d798551f65be1e1b
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 22 17:42:56 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e442954..10ecb00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libx11 (2:1.4.4-2) UNRELEASED; urgency=low
+libx11 (2:1.4.4-2) unstable; urgency=low
[ Colin Watson ]
* Fix cross-compilation breakage due to a typo in the multiarch patch
(closes: #642402)
- -- Julien Cristau <jcris...@debian.org> Thu, 22 Sep 2011 17:41:26 +0200
+ -- Julien Cristau <jcris...@debian.org> Thu, 22 Sep 2011 17:42:39 +0200
libx11 (2:1.4.4-1) unstable; urgency=low
commit 699a5d0b1ea5a91336c2f036437478c482e1da10
Author: Colin Watson <cjwat...@ubuntu.com>
Date: Thu Sep 22 09:56:24 2011 +0100
Bug#642402: libx11: multiarch patch broke cross-compilation
I attempted to cross-build libx11, and it failed as follows:
cd build && \
../configure \
--prefix=/usr \
--mandir=\${prefix}/share/man \
--infodir=\${prefix}/share/info \
--libdir=\${prefix}/lib/arm-linux-gnueabi
configure: loading site script /etc/dpkg-cross/cross-config.armel
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
[...]
X11 will be built with the following settings:
Loadable i18n module support: no
Loadable xcursor library support: yes
Threading support: yes
Use Threads safe API: yes
Threads stubs in libX11: no
XCMS: yes
Internationalization support: yes
XF86BigFont support: yes
XKB support: yes
XLOCALEDIR environment variable support: yes
Compose table cache enabled: yes
Functional specs building enabled: yes
enable-specs \
--with-xmlto \
--without-fop \
--build=i686-linux-gnu --host=arm-linux-gnueabi \
CFLAGS="-Wall -g -O2"
/bin/sh: enable-specs: not found
make: [build-stamp] Error 127 (ignored)
cd build && /usr/bin/make
[...]
(From here, the build proceeded, but for the wrong architecture.)
This bug was introduced by the multiarch patch
(http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/libx11.git;a=commitdiff;h=8a3ac024dc9bd0fc3d3500974551b9234ed8ab3a),
and is obviously a missing backslash-continuation. I don't know what
else may have broken, since --enable-specs --with-xmlto --without-fop
are also effectively missing along with the setting of CFLAGS.
Signed-off-by: Julien Cristau <jcris...@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 35a8496..e442954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.4.4-2) UNRELEASED; urgency=low
+
+ [ Colin Watson ]
+ * Fix cross-compilation breakage due to a typo in the multiarch patch
+ (closes: #642402)
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 22 Sep 2011 17:41:26 +0200
+
libx11 (2:1.4.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 8252735..b17e483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-specs \
--with-xmlto \
--without-fop \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r6m4g-00046b...@vasks.debian.org
