gcc-4.5 multiarch: cross-builds, multilib breakage

To: debian-gcc@lists.debian.org
Subject: gcc-4.5 multiarch: cross-builds, multilib breakage
From: Steve Langasek <steve.langasek@linaro.org>
Date: Mon, 21 Mar 2011 00:35:01 -0700
Message-id: <20110321073500.GC20509@virgil.dodds.net>
Mail-followup-to: Steve Langasek <steve.langasek@linaro.org>, debian-gcc@lists.debian.org

Getting tired of me yet? :-)

Three patches attached.  The first includes a set of fixes for the
cross-building support when multiarch is turned on.  The second is the
promised update corresponding to the preceding gcc-4.4 patch, fixing up the
multilib directories when building for multiarch.  The third and final patch
is a change to gcc-4.5-base, to put the architecture-specific list of
applied patches in a separate README.Debian.$arch so that this Multi-Arch:
same package doesn't put architecture-dependent data in a common path.

With this set, I believe we're current wrt Ubuntu natty as far as multiarch
support is concerned.

-- 
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/
slangasek@ubuntu.com                                     vorlon@debian.org

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek@linaro.org-20110321071557-\
#   016o1nos16rzksjl
# target_branch: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.5
# testament_sha1: 6a752860932cd40fdf7ec6a26cdd540d1564ec1d
# timestamp: 2011-03-21 00:16:37 -0700
# base_revision_id: svn-v4:6ca36cf4-e1d1-0310-8c6f-\
#   e303bb2178ca:branches/sid/gcc-4.5:5124
# 
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog	2011-03-17 12:10:56 +0000
+++ debian/changelog	2011-03-21 07:15:57 +0000
@@ -18,6 +18,10 @@
   * OTOH, libgcj_bc *is* in $(libdir).
   * the spu build is not a multiarch build; look in the correct
     non-multiarch directory.
+  * debian/rules2: pass --libdir also for stageX builds, needed in order to
+    successfully build for multiarch.
+  * debian/rules2: $(usr_lib) for a cross-build should not include the
+    multiarch dir as part of the path.
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 13 Mar 2011 16:42:03 -0700
 

=== modified file 'debian/rules2'
--- debian/rules2	2011-03-17 12:10:56 +0000
+++ debian/rules2	2011-03-21 07:15:57 +0000
@@ -161,6 +161,7 @@
 	--disable-multilib  \
 	--disable-threads \
 	--libexecdir=/$(libexecdir) \
+	--libdir=/$(PF)/$(libdir) \
 	--with-build-sysroot=$(with_build_sysroot) \
 	--with-sysroot=$(with_sysroot)
 
@@ -664,7 +665,11 @@
 d_l= debian/$(p_l)
 d_d= debian/$(p_d)
 
-usr_lib = $(PFL)/$(libdir)
+ifeq ($(DEB_CROSS),yes)
+  usr_lib = $(PFL)/lib
+else
+  usr_lib = $(PFL)/$(libdir)
+endif
 usr_lib32 = $(PFL)/lib32
 usr_libn32 = $(PFL)/lib32
 usr_lib64 = $(PFL)/lib64

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWbKF5sABO3fgEAwVnf/918E
2ES///9wYAdr6gAAFAAAAAAajSg0A2poMhoYhiYjTCYjIASlU/R6Sj8pqP1Mp5PShpiNAMRkaB+q
aMQ5gE0wCZDAAEwTAAADmATTAJkMAATBMAAAOYBNMAmQwABMEwAAAKlEAgDQEaBDU9TTFNTxlAG1
TyEBGRKxDWHjhIOOtPeRcvqDowDUzKpbBacYNtPuJJWspjIaWKKXmGMaOxztVjFHrTTaIonWdRK+
psMIewaSilJSlKSlP9/4k+9rFwq42Kujrgsi+1VzW1VzCtkXFpd+ic58H0eBIoCgkdI/iJksHkQz
E5a6rrjveLUsTBcqLHqseLm6vg6qUpTUWNvqp5+favuQtuqj6fnrUUaDE0DMlhxJd9ClCvpm9H+v
7/3piwedX/3zHxg7oj8XWQzgyPm4wd8Txg5Pc/WezyWxVgNGJWTbW17pI9pI8+T000pzPKLdZnFL
sla1e7pihWhr2WvzFILbV0kWefAV5Ol1sFqRfBepxfNbXmrEW3ROssvWXiyNC/8Pa7Jexia7dVUs
pHKC7FlBlvtiMK4xG/mZdn22RFi1Z82cXcdlN9tupq2qYjKuxU37X3bG2yIumN80juFWT10wdfwu
Pyp83Roo0nE4uHLlIYM3Te9BdE4NjPCiwsaXhEb93dEZYuUGMoxvbKxNPSqrYrhhhmoa2vBRpveG
du456GiGQ+pI8Odzfoph4ti7XWmuxRbbE2lOGDjBjTG2DCkRmpnLl6m64ynJ1kNj5M1FC40wX52b
6buxugzkm1uuHCjUZuS5ooyvcOLZtWllcnXhLutGyj+Io3JkwYK8WS6/FctbUv0q0abtdHSnF44t
0YaWhr1xON+OjWuGFSsyG7RueUUX61Ft/Rti6rTdvaatTVRoYaDDLa3XNW3VMHcs1s2FKeUTSzkz
k3/2JxjODkta2qDaGtwVbKo3L2yIxtuvqsxWUwymH/YmXXGJiggQAeiWQa5BLcBUPS6EShlfI6o4
EEir+GFJO4ix33tObk06aO0GMGa5kxOirfExKLmkwGjXs3t1jVbZnvxXa96rXFVk4bG3br1XKFaW
ql8UrFLFMnODYrfpbFquLNVMVRRgpalkmUMMJKPqnAx+Kmw4qFaqUPwWUU8u95n5MDWPOSNWiUKU
pKUn+n3/X/dv7zEkfqzffCfv9vv+LQw9anU6qw6H0+twwdlgvoesHme97KWQfL9Pfje1NTXD9Nja
WrAtkP6vlJG5PyuNaTGSKMnwhKv4lFHK+Pohynkzc7Fj5LFrkvvfJXnB3fLB8WqPC/G24KxLZDN/
Qo+KS7d5SFFdlabsrFG7b9NyshgzuYMzCC+DnIfzM9i6Dxdyjn7H9FsHhaq6ujq8nWUL4NcHd7nL
8+p0zdmLJtk0DdV0dna9FTq2bHMnHlSnFxdGzZ5p2YqS9sfX3d1P2XFXBZJFh5Pt4eMHepEpSDlY
4eiq9Snlbb5N/bD2PU0TH2VlWxtKQ355KvcoGt8KsXCyn7OzNlxqxWPBc6wm3DS9FGzn+6wzT1ei
eCUHPdO7q2+juJupG9Hm7O9RjCakURVb5vCDNzerxaIOnnTue3o8tC/qmyT+DsfA86Q9Ts4p0ki6
E/Alz7R8IlqcY76UpkSiVL6wWNKNy6aOQVOyLMmEHs/ZFF736KJ8RyJacJpkij7Qw/TmzWNaNMns
j3rDRQcHGWxKyRvh7D+ZLBejBUfOSPBxUQvqjvyObNT+0kds2BpksalhuVd8WnFsM3aJ4rlyfzq7
2MuJe6RUqLS2SLJCkjZYtWWySbnqLl5LqCiePi7m6SPxFMGacGKOy6ZJlDB2kiyPlanoLyjf+Tqy
6KFBRKpax7rmdrYUcqLFihTgWQ7pC4qokvdWlLZIx8KxfJG6zU4lq9f7z83mWJ3DawYRPcsKxcKI
1WKu++E3WqTwUm03NhNccEWnwGo2UKanI1tptNSjS3yjYlFZRX4KQ9OdUyydnZYof9HMo3vqskja
N7BUoysMmguXw0SW0HJY4YOwyYI8jxMND1fpE8I6wmxKIviiO5raVZRRRRPv6xOGcXDB/4XckU4U
JBmyhebA

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek@linaro.org-20110321072642-\
#   hl0le3pg3pk631qg
# target_branch: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.5
# testament_sha1: 60ae79fdb5262250842874e5c8dfdf7599468f14
# timestamp: 2011-03-21 00:26:49 -0700
# base_revision_id: svn-v4:6ca36cf4-e1d1-0310-8c6f-\
#   e303bb2178ca:branches/sid/gcc-4.5:5124
# 
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog	2011-03-17 12:10:56 +0000
+++ debian/changelog	2011-03-21 07:26:42 +0000
@@ -18,6 +18,13 @@
   * OTOH, libgcj_bc *is* in $(libdir).
   * the spu build is not a multiarch build; look in the correct
     non-multiarch directory.
+  * debian/patches/gcc-multiarch+biarch.diff: restore the original intent of
+    the patch, namely, that the multilib dir for the default variant is
+    always equal to libdir (the multiarch dir), and we walk up the tree
+    to find lib<qual> for the secondary variant.
+  * debian/patches/gcc-multiarch+biarch32.diff: apply the same multilib
+    directory rewriting for biarch paths with multiarch as we do without;
+    still needed in the near term.
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 13 Mar 2011 16:42:03 -0700
 

=== modified file 'debian/patches/gcc-multiarch+biarch.diff'
--- debian/patches/gcc-multiarch+biarch.diff	2011-03-14 22:18:13 +0000
+++ debian/patches/gcc-multiarch+biarch.diff	2011-03-21 07:26:42 +0000
@@ -7,7 +7,7 @@
  MULTILIB_OPTIONS = m64/m31
  MULTILIB_DIRNAMES = 64 32
 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,.) $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,.)
++MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
 --- a/src/gcc/config/sparc/t-linux64
 +++ b/src/gcc/config/sparc/t-linux64
 @@ -26,7 +26,7 @@
@@ -15,7 +15,7 @@
  MULTILIB_OPTIONS = m64/m32
  MULTILIB_DIRNAMES = 64 32
 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,.) $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,.)
++MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
@@ -26,7 +26,7 @@
  MULTILIB_OPTIONS = m64/m32
  MULTILIB_DIRNAMES = 64 32 
 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,.) $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,.)
++MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
@@ -37,7 +37,7 @@
  MULTILIB_EXCEPTIONS     =
  MULTILIB_EXCLUSIONS     =
 -MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES	= $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,.) $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../../lib32,.)
++MULTILIB_OSDIRNAMES	= $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
  MULTILIB_MATCHES        =
  
  softfp_wrap_start := '\#ifndef __powerpc64__'

=== added file 'debian/patches/gcc-multiarch+biarch32.diff'
--- debian/patches/gcc-multiarch+biarch32.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/gcc-multiarch+biarch32.diff	2011-03-21 07:26:42 +0000
@@ -0,0 +1,52 @@
+# DP: Use lib instead of lib64 as multilibdir on amd64, sparc64 and ppc64,
+# DP: including when building for multiarch.
+
+Index: trunk/src/gcc/config/i386/t-linux64
+===================================================================
+--- trunk.orig/src/gcc/config/i386/t-linux64
++++ trunk/src/gcc/config/i386/t-linux64
+@@ -25,7 +25,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
++MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,../lib32)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+Index: trunk/src/gcc/config/rs6000/t-linux64
+===================================================================
+--- trunk.orig/src/gcc/config/rs6000/t-linux64
++++ trunk/src/gcc/config/rs6000/t-linux64
+@@ -36,7 +36,7 @@
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+ MULTILIB_EXCEPTIONS     =
+ MULTILIB_EXCLUSIONS     =
+-MULTILIB_OSDIRNAMES	= $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
++MULTILIB_OSDIRNAMES	= . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,../lib32)
+ MULTILIB_MATCHES        =
+ 
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+Index: trunk/src/gcc/config/s390/t-linux64
+===================================================================
+--- trunk.orig/src/gcc/config/s390/t-linux64
++++ trunk/src/gcc/config/s390/t-linux64
+@@ -7,4 +7,4 @@
+ 
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
++MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,../lib32)
+Index: trunk/src/gcc/config/sparc/t-linux64
+===================================================================
+--- trunk.orig/src/gcc/config/sparc/t-linux64
++++ trunk/src/gcc/config/sparc/t-linux64
+@@ -26,7 +26,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64) .
++MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,../lib32)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib

=== modified file 'debian/rules.patch'
--- debian/rules.patch	2011-03-14 22:18:13 +0000
+++ debian/rules.patch	2011-03-21 07:26:42 +0000
@@ -251,6 +251,12 @@
 debian_patches += gcc-powerpc-undef
 ifeq ($(with_multiarch_lib),yes)
   debian_patches += gcc-multiarch+biarch
+  ifeq ($(biarch32),yes)
+    debian_patches += gcc-multiarch+biarch32
+  endif
+  ifneq (,$(findstring sparc64,$(DEB_TARGET_ARCH)))
+    debian_patches += gcc-multiarch+biarch32
+  endif
 else
   ifeq ($(biarch32),yes)
     debian_patches += gcc-multilib64

# Begin bundle
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
x2qckvf/i7kinChIcQjTPoA=

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek@linaro.org-20110321073119-\
#   z4e4tjdl1f1ffsxq
# target_branch: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.5
# testament_sha1: b96feb97f5d8695b9e3bacabea3e458c9241c407
# timestamp: 2011-03-21 00:31:43 -0700
# base_revision_id: svn-v4:6ca36cf4-e1d1-0310-8c6f-\
#   e303bb2178ca:branches/sid/gcc-4.5:5124
# 
# Begin patch
=== renamed file 'debian/README' => 'debian/README.Debian'
--- debian/README	2007-09-01 21:27:37 +0000
+++ debian/README.Debian	2011-03-21 07:31:19 +0000
@@ -31,3 +31,6 @@
 Arthur Loiret <arthur.loiret@gmail.com>		(gdc)
 
 ===============================================================================
+
+Information about patches applied to this package can be found in
+README.Debian.$arch for the corresponding architecture.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-17 12:10:56 +0000
+++ debian/changelog	2011-03-21 07:31:19 +0000
@@ -18,6 +18,11 @@
   * OTOH, libgcj_bc *is* in $(libdir).
   * the spu build is not a multiarch build; look in the correct
     non-multiarch directory.
+  * Put our list of patches in README.Debian.$(DEB_TARGET_ARCH) instead of
+    in README.Debian, so that the individual files are architecture-neutral
+    and play nicely with multiarch.  LP: #737846.
+  * Add a comment at the bottom of README.Debian with a pointer to the new
+    file listing the patches.
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 13 Mar 2011 16:42:03 -0700
 

=== modified file 'debian/rules.d/binary-base.mk'
--- debian/rules.d/binary-base.mk	2010-11-17 11:52:18 +0000
+++ debian/rules.d/binary-base.mk	2011-03-21 07:31:19 +0000
@@ -30,7 +30,7 @@
 	ln -sf $(BASE_VERSION) $(d_base)/usr/spu/lib/gcc/spu/$(GCC_VERSION)
 endif
 
-	dh_installdocs -p$(p_base)
+	dh_installdocs -p$(p_base) debian/README.Debian.$(DEB_TARGET_ARCH)
 	dh_installchangelogs -p$(p_base)
 	dh_compress -p$(p_base)
 	dh_fixperms -p$(p_base)

=== modified file 'debian/rules2'
--- debian/rules2	2011-03-17 12:10:56 +0000
+++ debian/rules2	2011-03-21 07:31:19 +0000
@@ -839,8 +839,7 @@
 	fi
 endif
 	rm -f $(configure_stamp) $(build_stamp)
-	: # generate debian/README.Debian
-	cat debian/README $(patch_stamp) > debian/README.Debian
+	cp $(patch_stamp) debian/README.Debian.$(DEB_TARGET_ARCH)
 
 	rm -rf $(builddir)
 	mkdir $(builddir)
@@ -1508,7 +1507,7 @@
 	rm -f debian/shlibs.local debian/substvars.local
 	rm -f debian/*.debhelper
 	-[ -d debian/bugs ] && $(MAKE) -C debian/bugs clean
-	rm -f debian/README.libstdc++-baseline debian/README.Bugs debian/README.Debian
+	rm -f debian/README.libstdc++-baseline debian/README.Bugs debian/README.Debian.$(DEB_TARGET_ARCH)
 	rm -f debian/lib*gcj-bc.shlibs
 	rm -rf bin locales share
 	rm -rf check-inst

# Begin bundle
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
lxLBaE5gzQusNR0UBQqRL/4u5IpwoSGJz84g

Attachment: signature.asc
Description: Digital signature

Reply to:

Follow-Ups:
- Re: gcc-4.5 multiarch: cross-builds, multilib breakage
  - From: Matthias Klose <doko@debian.org>

Prev by Date: Bug#619090: RM: gcc-4.1-doc-non-dfsg, gcc-4.2-doc-non-dfsg -- RoQA; documents a gcc version we don't ship
Next by Date: Re: gcc build failures on alpha
Previous by thread: Bug#619090: RM: gcc-4.1-doc-non-dfsg, gcc-4.2-doc-non-dfsg -- RoQA; documents a gcc version we don't ship
Next by thread: Re: gcc-4.5 multiarch: cross-builds, multilib breakage
Index(es):
- Date
- Thread