On Thu, Feb 17, 2011 at 06:36:08PM -0800, Steve Langasek wrote: > I have another round of multiarch fixes for gcc, following on to the ones > from last July. They're fairly minor; I think the changelog speaks for > itself:
Funny thing, it turns out that gcj is much farther down the stack for bootstrapping multiarch than it has any right to be (libpam-modules depends: libdb4.8 build-depends: gcj). So I have another round of fixes, much sooner than I had expected. * debian/rules.d/binary-java.mk: jvm-exports path is /usr/lib/jvm-exports, not $(libdir)/jvm-exports. * OTOH, libgcj_bc *is* in $(libdir). Attached is a patch against gcc-4.5 for these fixes as well. These changes are safe to apply, as libdir == lib in the non-multiarch case. Note that although this will install the gcj libs to the /usr/lib/$tuple directories when with_multiarch_lib = yes, I have not marked up any of the gcj packages as 'Multi-Arch: same' because of the use of the /usr/lib/jvm/ path to point at architecture-specific libraries. These changes are also available as a branch, published here: https://code.launchpad.net/~vorlon/debian/sid/gcc-4.5/gcj-multiarch 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
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vor...@debian.org-20110219032747-ed9jbshdv6q9k36c # target_branch: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.5 # testament_sha1: 424729a25b139c9271a24c2e8879a166e37b6510 # timestamp: 2011-02-18 19:29:50 -0800 # base_revision_id: svn-v4:6ca36cf4-e1d1-0310-8c6f-\ # e303bb2178ca:branches/sid/gcc-4.5:5051 # # Begin patch === modified file 'debian/changelog' --- debian/changelog 2011-02-18 12:01:00 +0000 +++ debian/changelog 2011-02-19 03:27:47 +0000 @@ -10,6 +10,9 @@ * debian/rules2: use $libdir for libiberty.a. * debian/patches/gcc-multiarch-*.diff: make sure we're using the same set_multiarch_path definition for all variants. + * debian/rules.d/binary-java.mk: jvm-exports path is /usr/lib/jvm-exports, + not $(libdir)/jvm-exports. + * OTOH, libgcj_bc *is* in $(libdir). -- Matthias Klose <d...@debian.org> Wed, 16 Feb 2011 23:58:48 +0100 === modified file 'debian/rules.d/binary-java.mk' --- debian/rules.d/binary-java.mk 2010-08-30 07:48:40 +0000 +++ debian/rules.d/binary-java.mk 2011-02-18 06:17:46 +0000 @@ -83,7 +83,7 @@ $(PF)/$(libdir)/libgcj.spec \ $(jvm_dir)/include \ $(jvm_dir)/bin/{appletviewer,jar,jarsigner,javadoc,javah,native2ascii,rmic,serialver} \ - $(PF)/$(libdir)/jvm-exports + $(PF)/lib/jvm-exports ifneq ($(GFDL_INVARIANT_FREE),yes) files_jdk += \ @@ -570,7 +570,7 @@ mv $(d_jdk)/$(PF)/$(libdir)/libgcj.spec $(d_jdk)/$(gcc_lib_dir)/ - install -m 755 $(d)/$(PF)/lib/libgcj_bc.so.1 \ + install -m 755 $(d)/$(PF)/$(libdir)/libgcj_bc.so.1 \ $(d_jdk)/$(gcc_lib_dir)/libgcj_bc.so $(builddir)/gcc/xgcc -B$(builddir)/gcc/ -shared -fpic -xc /dev/null \ -o build/libgcj.so -Wl,-soname,libgcj.so.$(GCJ_SONAME) -nostdlib # Begin bundle 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
signature.asc
Description: Digital signature