On Fri, Sep 09, 2011 at 05:09:19PM +0200, Sven Joachim wrote: > On 2011-09-09 13:54 +0200, Philipp Kern wrote: > > I intend to upload the attached NMU to DELAYED/2-days later today. I > > hope that's ok with you? It makes emacs23 buildable again in sid and > > adjusts the build-dependency on libjpeg to use the right dev package. > I haven't tested it, but the attached diff is definitely not > sufficient. To fix #629567 you need to patch src/s/gnu-linux.h as I > mentioned in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629567#10. > > Also, emacs23 will still FTBFS on any-i386 unless you include the patch > from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620795#38.
True. It did build and work just fine on amd64 with the patches I proposed. So the attached debdiff builds on both i386 and amd64. > If you fix those problems it would be good to test whether the segfault > I experienced in http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8623 still > occurs. IIRC I could not reproduce it anymore when building emacs23 > with later gcc-4.6 versions, but my memory might be faulty. Doesn't crash for me on amd64. I put the result into DELAYED/2-days and cut my original build. Kind regards Philipp Kern
diff -Nru emacs23-23.3+1/debian/changelog emacs23-23.3+1/debian/changelog
--- emacs23-23.3+1/debian/changelog 2011-04-10 19:40:31.000000000 +0200
+++ emacs23-23.3+1/debian/changelog 2011-09-09 20:25:37.000000000 +0200
@@ -1,3 +1,17 @@
+emacs23 (23.3+1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depend on libjpeg-dev instead of libjpeg62-dev.
+ (Closes: #633744)
+ * Add multiarch compatibility by passing the right crt-dir
+ to configure. (Closes: #629567)
+ * Also use the correct crt1.o location in gnu-linux.h; thanks
+ to Sven Joachim. (Closes: #629567)
+ * Fix up manged include paths on i386 due to multiarch.
+ (Closes: #620795)
+
+ -- Philipp Kern <pk...@debian.org> Fri, 09 Sep 2011 20:24:47 +0200
+
emacs23 (23.3+1-1) unstable; urgency=low
* Incorporate new upstream version 23.3.
diff -Nru emacs23-23.3+1/debian/control emacs23-23.3+1/debian/control
--- emacs23-23.3+1/debian/control 2011-04-10 19:41:48.000000000 +0200
+++ emacs23-23.3+1/debian/control 2011-09-09 20:40:36.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Rob Browning <r...@defaultvalue.org>
Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev,
librsvg2-dev,
libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
- libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
+ libpng12-dev, libjpeg-dev, libm17n-dev, libotf-dev,
libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,
autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
diff -Nru emacs23-23.3+1/debian/control.in emacs23-23.3+1/debian/control.in
--- emacs23-23.3+1/debian/control.in 2011-04-10 19:33:31.000000000 +0200
+++ emacs23-23.3+1/debian/control.in 2011-09-09 13:18:37.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Rob Browning <r...@defaultvalue.org>
Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev,
librsvg2-dev,
libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
- libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
+ libpng12-dev, libjpeg-dev, libm17n-dev, libotf-dev,
libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,
autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
diff -Nru
emacs23-23.3+1/debian/patches/0014-Cope-with-multiarch-location-of-crt1.o.patch
emacs23-23.3+1/debian/patches/0014-Cope-with-multiarch-location-of-crt1.o.patch
---
emacs23-23.3+1/debian/patches/0014-Cope-with-multiarch-location-of-crt1.o.patch
1970-01-01 01:00:00.000000000 +0100
+++
emacs23-23.3+1/debian/patches/0014-Cope-with-multiarch-location-of-crt1.o.patch
2011-09-09 18:59:13.000000000 +0200
@@ -0,0 +1,27 @@
+Author: Sven Joachim <svenj...@gmx.de>
+Date: Sat, 25 Jun 2011 08:25:48 +0200
+Bug-Debian: http://bugs.debian.org/629567
+Subject: Cope with multiarch location of crt1.o
+Applied-Upstream:
http://lists.gnu.org/archive/html/emacs-diffs/2010-04/msg00325.html
+---
+
+--- emacs23-23.3+1.orig/src/s/gnu-linux.h
++++ emacs23-23.3+1/src/s/gnu-linux.h
+@@ -168,7 +168,7 @@ along with GNU Emacs. If not, see <http
+ /* Ask GCC where to find libgcc.a. */
+ #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
+
+-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
++#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
+
+ /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
+ says where to find X windows at run time. */
+@@ -198,7 +198,7 @@ along with GNU Emacs. If not, see <http
+ #define LIBS_DEBUG
+ #undef LIB_GCC
+ #define LIB_GCC
+-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
++#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
+
+ /* Don't use -g in test compiles in configure.
+ This is so we will use the same shared libs for that linking
diff -Nru
emacs23-23.3+1/debian/patches/0015-Cope-with-multiarch-dir-being-special-on-i386.patch
emacs23-23.3+1/debian/patches/0015-Cope-with-multiarch-dir-being-special-on-i386.patch
---
emacs23-23.3+1/debian/patches/0015-Cope-with-multiarch-dir-being-special-on-i386.patch
1970-01-01 01:00:00.000000000 +0100
+++
emacs23-23.3+1/debian/patches/0015-Cope-with-multiarch-dir-being-special-on-i386.patch
2011-09-09 20:24:36.000000000 +0200
@@ -0,0 +1,33 @@
+Author: Sven Joachim <svenj...@gmx.de>
+Bug-Debian: http://bugs.debian.org/620795
+Subject: Cope with multiarch dir being special on i386
+---
+
+Index: emacs23-23.3+1/lib-src/Makefile.in
+===================================================================
+--- emacs23-23.3+1.orig/lib-src/Makefile.in
++++ emacs23-23.3+1/lib-src/Makefile.in
+@@ -141,6 +141,9 @@
+ # ========================== start of cpp stuff =======================
+ /* From here on, comments must be done in C syntax. */
+
++/* Make sure a built-in define doesn't break our multiarch include path! */
++#undef i386
++
+ #define THIS_IS_MAKEFILE
+ #define NOT_C_CODE
+ #include "../src/config.h"
+Index: emacs23-23.3+1/src/Makefile.in
+===================================================================
+--- emacs23-23.3+1.orig/src/Makefile.in
++++ emacs23-23.3+1/src/Makefile.in
+@@ -73,6 +73,9 @@
+ # ========================== start of cpp stuff =======================
+ /* From here on, comments must be done in C syntax. */
+
++/* Make sure a built-in define doesn't break our multiarch include path! */
++#undef i386
++
+ C_SWITCH_SYSTEM=
+
+ /* just to be sure the sh is used */
diff -Nru emacs23-23.3+1/debian/patches/series
emacs23-23.3+1/debian/patches/series
--- emacs23-23.3+1/debian/patches/series 2011-04-10 19:33:31.000000000
+0200
+++ emacs23-23.3+1/debian/patches/series 2011-09-09 20:24:43.000000000
+0200
@@ -11,3 +11,5 @@
0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
+0014-Cope-with-multiarch-location-of-crt1.o.patch
+0015-Cope-with-multiarch-dir-being-special-on-i386.patch
diff -Nru emacs23-23.3+1/debian/rules emacs23-23.3+1/debian/rules
--- emacs23-23.3+1/debian/rules 2011-04-10 19:33:31.000000000 +0200
+++ emacs23-23.3+1/debian/rules 2011-09-09 12:55:14.000000000 +0200
@@ -446,6 +446,9 @@
confflags += --with-pop=yes
confflags += --enable-locallisppath=$(local_lpath)
+# multiarch compatibility
+confflags += --with-crt-dir=/usr/lib/$(shell dpkg-architecture
-qDEB_HOST_MULTIARCH)
+
# x configure flags
confflags_x := $(confflags)
confflags_x += --with-x=yes
signature.asc
Description: Digital signature
