Your message dated Sun, 11 Sep 2011 21:03:02 +0000
with message-id <e1r2rb8-0008qw...@franck.debian.org>
and subject line Bug#620795: fixed in emacs23 23.3+1-1.1
has caused the Debian Bug report #620795,
regarding emacs23: Makefile generation with cpp mangles multiarch include paths 
(impending FTBFS)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
620795: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620795
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: emacs23
Version: 23.2+1-7
Severity: normal
User: vor...@debian.org
Usertags: multiarch

Hi Rob,

Having begun to convert libraries over to multiarch in Ubuntu, we've found
emacs23 among the packages which fails to build.  This is because the
two-stage, autoconf+cpp generation of src/Makefile and lib-src/Makefile
results in strings like "-I/usr/lib/i386-linux-gnu/glib-2.0" being seen as
input to cpp... which has "i386" as a macro defined to "1".  So unless these
macros are undefined, the path that winds up in the Makefile is broken and
results in a build failure.

The attached patch partially addresses this by undefining any macros that
happen to exist for the <cpu> portion of the architecture triplet.  Only
architectures for which Ubuntu currently builds are handled here, however;
for Debian either a more comprehensive list or a generic fix is needed. 
It's possible that passing -fdirectives-only to cpp would solve this, but I
haven't tested.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru emacs23-23.2+1/debian/patches/no_cpp_multiarch_dir_mangling.diff emacs23-23.2+1/debian/patches/no_cpp_multiarch_dir_mangling.diff
--- emacs23-23.2+1/debian/patches/no_cpp_multiarch_dir_mangling.diff	1969-12-31 16:00:00.000000000 -0800
+++ emacs23-23.2+1/debian/patches/no_cpp_multiarch_dir_mangling.diff	2011-04-04 01:27:54.000000000 -0700
@@ -0,0 +1,36 @@
+Index: emacs23-23.2+1/lib-src/Makefile.in
+===================================================================
+--- emacs23-23.2+1.orig/lib-src/Makefile.in
++++ emacs23-23.2+1/lib-src/Makefile.in
+@@ -141,6 +141,13 @@
+ # ========================== 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
++#undef x86_64
++#undef powerpc
++#undef powerpc64
++#undef arm
++
+ #define THIS_IS_MAKEFILE
+ #define NOT_C_CODE
+ #include "../src/config.h"
+Index: emacs23-23.2+1/src/Makefile.in
+===================================================================
+--- emacs23-23.2+1.orig/src/Makefile.in
++++ emacs23-23.2+1/src/Makefile.in
+@@ -70,6 +70,13 @@
+ # ========================== 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
++#undef x86_64
++#undef powerpc
++#undef powerpc64
++#undef arm
++
+ C_SWITCH_SYSTEM=
+ 
+ /* just to be sure the sh is used */
diff -Nru emacs23-23.2+1/debian/patches/series emacs23-23.2+1/debian/patches/series
--- emacs23-23.2+1/debian/patches/series	2011-01-26 06:19:34.000000000 -0800
+++ emacs23-23.2+1/debian/patches/series	2011-04-04 01:25:32.000000000 -0700
@@ -19,3 +19,4 @@
 fix-fc-dual-font-width-calculation.diff
 do-not-initialize-terminal-twice.diff
 fix-epg-digest-algorithm-alist.diff
+no_cpp_multiarch_dir_mangling.diff

--- End Message ---
--- Begin Message ---
Source: emacs23
Source-Version: 23.3+1-1.1

We believe that the bug you reported is fixed in the latest version of
emacs23, which is due to be installed in the Debian FTP archive:

emacs23-bin-common_23.3+1-1.1_amd64.deb
  to main/e/emacs23/emacs23-bin-common_23.3+1-1.1_amd64.deb
emacs23-bin-common_23.3+1-1.1_i386.deb
  to main/e/emacs23/emacs23-bin-common_23.3+1-1.1_i386.deb
emacs23-common_23.3+1-1.1_all.deb
  to main/e/emacs23/emacs23-common_23.3+1-1.1_all.deb
emacs23-el_23.3+1-1.1_all.deb
  to main/e/emacs23/emacs23-el_23.3+1-1.1_all.deb
emacs23-lucid_23.3+1-1.1_amd64.deb
  to main/e/emacs23/emacs23-lucid_23.3+1-1.1_amd64.deb
emacs23-lucid_23.3+1-1.1_i386.deb
  to main/e/emacs23/emacs23-lucid_23.3+1-1.1_i386.deb
emacs23-nox_23.3+1-1.1_amd64.deb
  to main/e/emacs23/emacs23-nox_23.3+1-1.1_amd64.deb
emacs23-nox_23.3+1-1.1_i386.deb
  to main/e/emacs23/emacs23-nox_23.3+1-1.1_i386.deb
emacs23_23.3+1-1.1.debian.tar.gz
  to main/e/emacs23/emacs23_23.3+1-1.1.debian.tar.gz
emacs23_23.3+1-1.1.dsc
  to main/e/emacs23/emacs23_23.3+1-1.1.dsc
emacs23_23.3+1-1.1_amd64.deb
  to main/e/emacs23/emacs23_23.3+1-1.1_amd64.deb
emacs23_23.3+1-1.1_i386.deb
  to main/e/emacs23/emacs23_23.3+1-1.1_i386.deb
emacs_23.3+1-1.1_all.deb
  to main/e/emacs23/emacs_23.3+1-1.1_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 620...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Philipp Kern <pk...@debian.org> (supplier of updated emacs23 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 09 Sep 2011 20:24:47 +0200
Source: emacs23
Binary: emacs emacs23-lucid emacs23-nox emacs23 emacs23-bin-common 
emacs23-common emacs23-el
Architecture: all amd64 i386 source
Version: 23.3+1-1.1
Distribution: unstable
Urgency: low
Maintainer: Rob Browning <r...@defaultvalue.org>
Changed-By: Philipp Kern <pk...@debian.org>
Closes: 620795 629567 633744
Description: 
 emacs23-bin-common - The GNU Emacs editor's shared, architecture dependent 
files
 emacs23-common - The GNU Emacs editor's shared, architecture independent 
infrastru
 emacs23-el - GNU Emacs LISP (.el) files
 emacs23-lucid - The GNU Emacs editor
 emacs23-nox - The GNU Emacs editor (without X support)
 emacs23    - The GNU Emacs editor (with GTK+ user interface)
 emacs      - The GNU Emacs editor (metapackage)
Changes: 
 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)
Checksums-Sha1: 
 ec6fc65ccd007b1dfc44158fe228478eefe93761 3426052 
emacs23-lucid_23.3+1-1.1_amd64.deb
 75cfa5a66c57ce38bae8c25a79f84a0a3880d327 3076018 
emacs23-nox_23.3+1-1.1_amd64.deb
 a599c64c5c22e8edb8d194fdf3b9eb9490fb8578 3424128 emacs23_23.3+1-1.1_amd64.deb
 3b078bbd96961e6513bb3f988aeceab1d0c303df 260638 
emacs23-bin-common_23.3+1-1.1_amd64.deb
 51f66e39fb2ef0dfb1fd3238aecc1e6eeb05cc97 1601 emacs23_23.3+1-1.1.dsc
 e4d43c0a8c056fbca28b9db335cc5d7fe96c42d9 50480 emacs23_23.3+1-1.1.debian.tar.gz
 e014847ca170d90169330dfbab3df97c81483e16 89900 emacs_23.3+1-1.1_all.deb
 ed760683819b369af322c688577fd3974573249d 3137200 
emacs23-lucid_23.3+1-1.1_i386.deb
 f115beb613eb8be4d9a4a0cbbe4aa9f705aeca3f 2817102 
emacs23-nox_23.3+1-1.1_i386.deb
 3caf5dcfd5c58953a736adf3004be05a6d59952b 3144580 emacs23_23.3+1-1.1_i386.deb
 f45b6eb43a58e37e3cd371f6e51332eece1ff2e0 248434 
emacs23-bin-common_23.3+1-1.1_i386.deb
 26e21b5d618eca9871b8fa247601a2546f838a49 18623596 
emacs23-common_23.3+1-1.1_all.deb
 e1585c7f38a345c302ec71bb85e5d75df53fdce0 13785564 emacs23-el_23.3+1-1.1_all.deb
Checksums-Sha256: 
 fc76cb36b87002a940672951475a953837e094b2253615a2f3cac94b0cbdb546 3426052 
emacs23-lucid_23.3+1-1.1_amd64.deb
 4da787eefc9b8054ee08a6e09fff034baa82935ee4c94dded2094c0da7033e0e 3076018 
emacs23-nox_23.3+1-1.1_amd64.deb
 513944e4728c824033e8fc3303eeaefe11449f24e102441a32072e5867f73e17 3424128 
emacs23_23.3+1-1.1_amd64.deb
 15d3d8105cfaa5d0961e95010028d1bc090dbbe7017f51bc026a0bde33fbdffc 260638 
emacs23-bin-common_23.3+1-1.1_amd64.deb
 250fdd64b4e477d7c0b7bced1390996314b335174d546060e7aa48e7293653f6 1601 
emacs23_23.3+1-1.1.dsc
 f6eec83104231ed7356a1f0edf80bdbc86e03989760d8f59fa21ba27b232e389 50480 
emacs23_23.3+1-1.1.debian.tar.gz
 8ec8ac511b9587cdb0d44689e0507aba1fe636455c344a6a23498ba6f779e5ff 89900 
emacs_23.3+1-1.1_all.deb
 efe3c76d6b47beb033ab9df6d97b14a9729ff7c5c3bb6aaf657b362e3ff31438 3137200 
emacs23-lucid_23.3+1-1.1_i386.deb
 76f70c24b9a11c5a6b8c426eb25743e13c4624d4a6cc37c02e50c80175167181 2817102 
emacs23-nox_23.3+1-1.1_i386.deb
 cf4032ef92162551a15263ea8ff01464f39b74b33f9b65e24e70a9e036e074d3 3144580 
emacs23_23.3+1-1.1_i386.deb
 471ec29ce278205330a67d058c73e9ab95e6945f3c38da368bb42fe2c4a88dd2 248434 
emacs23-bin-common_23.3+1-1.1_i386.deb
 a63d2449a3c62a7995391817e8c0764dbedc95eb61c69131f8dfe1a84619100b 18623596 
emacs23-common_23.3+1-1.1_all.deb
 447a008c73ad1aebb54742ec214d3464a5f15fa22cd709d6e54ef0fc0296175f 13785564 
emacs23-el_23.3+1-1.1_all.deb
Files: 
 c236d0956224b02b9a15d573c6b878d4 3426052 editors optional 
emacs23-lucid_23.3+1-1.1_amd64.deb
 703706da4c3b6333684de4987a607fbd 3076018 editors optional 
emacs23-nox_23.3+1-1.1_amd64.deb
 f934e73b99013a7bd860c93fa3cc9301 3424128 editors optional 
emacs23_23.3+1-1.1_amd64.deb
 fa1bf1dcf8d9e5a8ea1b85c2ebb00f14 260638 editors optional 
emacs23-bin-common_23.3+1-1.1_amd64.deb
 39dfeaf242c6bcde7a0cd6bcad83a59e 1601 editors optional emacs23_23.3+1-1.1.dsc
 3b6f2dcce21b2dbd929dad1a66b0193a 50480 editors optional 
emacs23_23.3+1-1.1.debian.tar.gz
 068cddf95ec9de8f7a6f5a6ee3418f38 89900 editors optional 
emacs_23.3+1-1.1_all.deb
 368f40381c71baab09e63dc5b9ac1df8 3137200 editors optional 
emacs23-lucid_23.3+1-1.1_i386.deb
 42942e3297c4a1bac62de2055fc9630c 2817102 editors optional 
emacs23-nox_23.3+1-1.1_i386.deb
 3769503c073c560e81cb533b25a4ebb2 3144580 editors optional 
emacs23_23.3+1-1.1_i386.deb
 043decab9e8fe2e49de87a08bcc1687b 248434 editors optional 
emacs23-bin-common_23.3+1-1.1_i386.deb
 5596a408467c412a1d075f440966ca35 18623596 editors optional 
emacs23-common_23.3+1-1.1_all.deb
 8060a0600465b9b83e1d50092c6bf5b9 13785564 editors optional 
emacs23-el_23.3+1-1.1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEAREIAAYFAk5qdNIACgkQ7Ro5M7LPzdhObwCgnmTUQCHrzaiitjLaFji5B9h+
L/kAn3uXQcST2eMWPuCf12XtUNrLf2Vm
=XZQn
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to