From patchwork Mon Mar 21 07:35:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Langasek X-Patchwork-Id: 696 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:45 -0000 Delivered-To: patches@linaro.org Received: by 10.220.28.198 with SMTP id n6cs118744vcc; Mon, 21 Mar 2011 00:35:09 -0700 (PDT) Received: by 10.91.84.9 with SMTP id m9mr3486407agl.149.1300692908625; Mon, 21 Mar 2011 00:35:08 -0700 (PDT) Received: from becquer.dodds.net (becquer.dodds.net [207.224.24.209]) by mx.google.com with ESMTP id 2si12872754anw.7.2011.03.21.00.35.06; Mon, 21 Mar 2011 00:35:07 -0700 (PDT) Received-SPF: neutral (google.com: 207.224.24.209 is neither permitted nor denied by best guess record for domain of steve.langasek@linaro.org) client-ip=207.224.24.209; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.224.24.209 is neither permitted nor denied by best guess record for domain of steve.langasek@linaro.org) smtp.mail=steve.langasek@linaro.org Received: from virgil.dodds.net (unknown [192.168.15.11]) by becquer.dodds.net (Postfix) with ESMTPA id 44AED251D9; Mon, 21 Mar 2011 00:35:04 -0700 (PDT) Received: by virgil.dodds.net (Postfix, from userid 1000) id 1F82440715; Mon, 21 Mar 2011 00:35:01 -0700 (PDT) Date: Mon, 21 Mar 2011 00:35:01 -0700 From: Steve Langasek To: debian-gcc@lists.debian.org Subject: gcc-4.5 multiarch: cross-builds, multilib breakage Message-ID: <20110321073500.GC20509@virgil.dodds.net> Mail-Followup-To: Steve Langasek , debian-gcc@lists.debian.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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. # 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 (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 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