[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#262892: marked as done (gcc-3.4 on amd64: Please replace 'lib64' hack by setting proper MULTILIB_OSDIRNAMES)



Your message dated Thu, 19 Aug 2004 12:32:15 -0400
with message-id <E1Bxppn-0001f3-00@newraff.debian.org>
and subject line Bug#262892: fixed in gcc-3.4 3.4.1ds1-7
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 2 Aug 2004 08:12:40 +0000
>From aj@andaco.de Mon Aug 02 01:12:40 2004
Return-path: <aj@andaco.de>
Received: from c204112.adsl.hansenet.de (localhost) [213.39.204.112] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BrXw0-0002jP-00; Mon, 02 Aug 2004 01:12:40 -0700
Received: from aj by localhost with local (Exim 4.34)
	id 1BrXvy-00054F-Vo; Mon, 02 Aug 2004 10:12:39 +0200
To: Debian Bug Tracking System <submit@bugs.debian.org>
From: Andreas Jochens <aj@andaco.de>
Subject: gcc-3.4 on amd64: Please replace 'lib64' hack by setting proper MULTILIB_OSDIRNAMES
Message-Id: <E1BrXvy-00054F-Vo@localhost>
Date: Mon, 02 Aug 2004 10:12:39 +0200
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Package: gcc-3.4
Severity: wishlist
Tags: patch

The attached patch removes the ugly 'lib64' symlink hack from 'debian/rules2'.

Instead it introduces an 'amd64-multilib.dpatch' in 'debian/patches', which
sets MULTILIB_OSDIRNAMES in 'src/gcc/config/i386/t-linux64' to the proper
values for the 'pure64' amd64 port, i.e. to '../lib' for 64bit libraries 
and to '../lib/i486-linux/' for 32bit libraries. The patch also enables the
'amd64-multilib.dpatch' for amd64 in 'debian/rules.patch'.

The name '../lib/i486-linux' for the 32bit library path conforms to the
current multiarch proposals for placing 32bit libraries.

At a later stage, this setting of MULTILIB_OSDIRNAMES will make it possible 
to drop the '--disable-multilib' option in CONFARGS and to build gcc-3.4 
with full multilib support as soon as the necessary 32bit libraries and 
files from glibc are installed in '/usr/lib/i486-linux' (basically libc.a, 
libm.a, libpthread.a and crt?.o are needed for this). With the current
setting of MULTILIB_OSDIRNAMES to '../lib64' and '../lib' this would never
be possible, because '../lib64' and '../lib' are the same directory 
in the pure64 port.

Regards
Andreas Jochens

diff -urN ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules2 ./debian/rules2
--- ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules2	2004-08-02 09:13:47.120367094 +0200
+++ ./debian/rules2	2004-08-02 09:13:05.819358217 +0200
@@ -922,14 +926,6 @@
 	rm -rf $(d)
 	mkdir -p $(d)/$(libdir) $(d)/$(PF)
 
-ifeq ($(DEB_TARGET_GNU_CPU),x86_64)
-	: # link lib to lib64 and usr/lib to usr/lib64
-	: # (this works when CONFARGS contains '--disable-multilib')
-	ln -s lib $(d)/lib64
-	mkdir -p $(d)/usr/lib
-	ln -s lib $(d)/usr/lib64
-endif
-
 	: # Install everything
 	PATH=$(PWD)/bin:$$PATH \
 	  $(MAKE) -C $(builddir) \
diff -urN ../tmp-orig/gcc-3.4-3.4.1ds1/debian/patches/amd64-multilib.dpatch ./debian/patches/amd64-multilib.dpatch
--- ../tmp-orig/gcc-3.4-3.4.1ds1/debian/patches/amd64-multilib.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ ./debian/patches/amd64-multilib.dpatch	2004-08-02 09:13:05.800361893 +0200
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+ 
+# DP: Set MULTILIB_OSDIRNAMES to the correct multilib path names for amd64.
+# DP: 
+# DP: 
+ 
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- src/gcc/config/i386/t-linux64~	2002-11-28 14:47:02.000000000 +0000
++++ src/gcc/config/i386/t-linux64	2004-06-02 16:07:30.533131301 +0000
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = ../lib ../lib/i486-linux
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff -urN ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.patch ./debian/rules.patch
--- ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.patch	2004-08-02 09:13:47.112368642 +0200
+++ ./debian/rules.patch	2004-08-02 09:13:05.802361506 +0200
@@ -72,6 +72,11 @@
 ifeq ($(DEB_TARGET_GNU_CPU),alpha)
   debian_patches += # alpha-ieee
 endif
+
+ifeq ($(DEB_TARGET_ARCH),amd64)
+  debian_patches += amd64-multilib
+endif
+
 ifeq ($(DEB_TARGET_GNU_CPU),arm)
   debian_patches += arm-libstdc++-soname
 endif

---------------------------------------
Received: (at 262892-close) by bugs.debian.org; 19 Aug 2004 16:38:04 +0000
>From katie@ftp-master.debian.org Thu Aug 19 09:38:04 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BxpvQ-0005yp-00; Thu, 19 Aug 2004 09:38:04 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1Bxppn-0001f3-00; Thu, 19 Aug 2004 12:32:15 -0400
From: Matthias Klose <doko@debian.org>
To: 262892-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#262892: fixed in gcc-3.4 3.4.1ds1-7
Message-Id: <E1Bxppn-0001f3-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Thu, 19 Aug 2004 12:32:15 -0400
Delivered-To: 262892-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 3

Source: gcc-3.4
Source-Version: 3.4.1ds1-7

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

cpp-3.4-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/cpp-3.4-doc_3.4.1-7_all.deb
cpp-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/cpp-3.4_3.4.1-7_i386.deb
fastjar_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/fastjar_3.4.1-7_i386.deb
g++-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/g++-3.4_3.4.1-7_i386.deb
g77-3.4-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/g77-3.4-doc_3.4.1-7_all.deb
g77-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/g77-3.4_3.4.1-7_i386.deb
gcc-3.4-base_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gcc-3.4-base_3.4.1-7_i386.deb
gcc-3.4-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/gcc-3.4-doc_3.4.1-7_all.deb
gcc-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gcc-3.4_3.4.1-7_i386.deb
gcc-3.4_3.4.1ds1-7.diff.gz
  to pool/main/g/gcc-3.4/gcc-3.4_3.4.1ds1-7.diff.gz
gcc-3.4_3.4.1ds1-7.dsc
  to pool/main/g/gcc-3.4/gcc-3.4_3.4.1ds1-7.dsc
gcj-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gcj-3.4_3.4.1-7_i386.deb
gij-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gij-3.4_3.4.1-7_i386.deb
gnat-3.4-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/gnat-3.4-doc_3.4.1-7_all.deb
gnat-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gnat-3.4_3.4.1-7_i386.deb
gobjc-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gobjc-3.4_3.4.1-7_i386.deb
gpc-2.1-3.4-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/gpc-2.1-3.4-doc_3.4.1-7_all.deb
gpc-2.1-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/gpc-2.1-3.4_3.4.1-7_i386.deb
lib64gcc1_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/lib64gcc1_3.4.1-7_i386.deb
lib64stdc++6_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/lib64stdc++6_3.4.1-7_i386.deb
libffi3-dev_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libffi3-dev_3.4.1-7_i386.deb
libffi3_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libffi3_3.4.1-7_i386.deb
libgcc1_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libgcc1_3.4.1-7_i386.deb
libgcj5-awt_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libgcj5-awt_3.4.1-7_i386.deb
libgcj5-common_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/libgcj5-common_3.4.1-7_all.deb
libgcj5-dev_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libgcj5-dev_3.4.1-7_i386.deb
libgcj5_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libgcj5_3.4.1-7_i386.deb
libgnat-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libgnat-3.4_3.4.1-7_i386.deb
libstdc++6-dbg_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libstdc++6-dbg_3.4.1-7_i386.deb
libstdc++6-dev_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libstdc++6-dev_3.4.1-7_i386.deb
libstdc++6-doc_3.4.1-7_all.deb
  to pool/main/g/gcc-3.4/libstdc++6-doc_3.4.1-7_all.deb
libstdc++6-pic_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libstdc++6-pic_3.4.1-7_i386.deb
libstdc++6_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/libstdc++6_3.4.1-7_i386.deb
treelang-3.4_3.4.1-7_i386.deb
  to pool/main/g/gcc-3.4/treelang-3.4_3.4.1-7_i386.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 262892@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Matthias Klose <doko@debian.org> (supplier of updated gcc-3.4 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 ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Thu, 19 Aug 2004 11:35:04 +0200
Source: gcc-3.4
Binary: g77-3.4-doc gcc-3.4-base libstdc++6 lib64gcj5-awt gnat-3.4 libobjc1 libgcj5 libgcc1 gcc-3.4 lib64g2c0 gobjc-3.4 libstdc++6-0 gcc-3.4-nof libgcc2 libstdc++6-dev libstdc++6-doc protoize libgnat-3.4 libgcj5-dev libstdc++6-0-pic libgcj5-common lib64stdc++6 libstdc++6-dbg gij-3.4 lib32gcc1 lib64gnat-3.4 lib64objc1 cpp-3.4 lib64gcj5 gcc-3.4-hppa64 gcc-3.4-soft-float libstdc++6-0-dev libgcj5-awt cpp-3.4-doc libgcj-common libffi3-dev gcc-3.4-doc libg2c0-dev gpc-2.1-3.4-doc lib64gcc1 fastjar treelang-3.4 libffi3 fixincludes libg2c0 lib32stdc++6 libstdc++6-pic lib64ffi3 gnat-3.4-doc libstdc++6-0-dbg gcj-3.4 gpc-2.1-3.4 g++-3.4 g77-3.4
Architecture: source i386 all
Version: 3.4.1ds1-7
Distribution: unstable
Urgency: medium
Maintainer: Debian GCC maintainers <debian-gcc@lists.debian.org>
Changed-By: Matthias Klose <doko@debian.org>
Description: 
 cpp-3.4    - The GNU C preprocessor
 cpp-3.4-doc - Documentation for the GNU C preprocessor (cpp)
 fastjar    - Jar creation utility
 g++-3.4    - The GNU C++ compiler
 g77-3.4    - The GNU Fortran 77 compiler
 g77-3.4-doc - Documentation for the GNU Fortran compiler (g77)
 gcc-3.4    - The GNU C compiler
 gcc-3.4-base - The GNU Compiler Collection (base package)
 gcc-3.4-doc - Documentation for the GNU compilers (gcc, gobjc, g++)
 gcj-3.4    - The GNU compiler for Java(TM)
 gij-3.4    - The GNU Java bytecode interpreter
 gnat-3.4   - The GNU Ada compiler
 gnat-3.4-doc - Documentation for the GNU Ada compiler (gnat)
 gobjc-3.4  - The GNU Objective-C compiler
 gpc-2.1-3.4 - The GNU Pascal compiler
 gpc-2.1-3.4-doc - Documentation for the GNU Pascal compiler (gpc)
 lib64gcc1  - GCC support library (64bit)
 lib64stdc++6 - The GNU Standard C++ Library v3 (64bit)
 libffi3    - Foreign Function Interface library runtime
 libffi3-dev - Foreign Function Interface library (development files)
 libgcc1    - GCC support library
 libgcj5    - Java runtime library for use with gcj
 libgcj5-awt - AWT peer runtime libraries for use with gcj
 libgcj5-common - Java runtime library for use with gcj (jar files)
 libgcj5-dev - Java development headers and static library for use with gcj
 libgnat-3.4 - Runtime library for GNU Ada applications
 libstdc++6 - The GNU Standard C++ Library v3
 libstdc++6-dbg - The GNU Standard C++ Library v3 (debugging files)
 libstdc++6-dev - The GNU Standard C++ Library v3 (development files)
 libstdc++6-doc - The GNU Standard C++ Library v3 (documentation files)
 libstdc++6-pic - The GNU Standard C++ Library v3 (shared library subset kit)
 treelang-3.4 - The GNU Treelang compiler
Closes: 257906 261051 262892 263019 263925 263928 263951 264129 264857 265652
Changes: 
 gcc-3.4 (3.4.1ds1-7) unstable; urgency=medium
 .
   * Updated to gcc-3.4 CVS 20040819.
   * On amd64, build a biarch compiler defaulting to 64 bit.
     - build lib32gcc1 and lib32stdc++6 packages (closes: #257906).
   * On i386, build a biarch compiler defaulting to 32bit (Dan Jacobowitz).
   * Add proposed patch for 3.4 regression PR16706 (closes: #261051).
   * Remove superfluous ')' in debian/rules.def (closes: #263951).
   * debian/rules2: Correct typo for cross builds (closes: #263928).
   * Update cross-configure.dpatch (closes: #263925).
   * Tighten binutils build-dependency/dependency to (>= 2.15-2).
     Closes: #263019.
   * Tighten glibc dependency, needed at least for m68k to avoid
     regressions with new binutils.
   * libgcj.pc is included in libgcj5-dev package (closes: #264129).
   * Replace 'lib64' hack by setting proper MULTILIB_OSDIRNAMES
     (Andreas Metzler). Closes: #262892.
   * Reenable the complete build of the libgcj5-awt package.
   * Add /lib64 link to /lib for architecture powerpc64 (closes: #264857).
   * Fix libgcj5-common doc dir symlink (closes: #265652).
Files: 
 8561a7016634773c17069b0ffa54364e 2691 devel optional gcc-3.4_3.4.1ds1-7.dsc
 a2a08de3a72fa96bba5276a4fbc9c273 4011368 devel optional gcc-3.4_3.4.1ds1-7.diff.gz
 a2bba0c69468378e9ef0815e1db7d27f 181556 doc optional cpp-3.4-doc_3.4.1-7_all.deb
 68a2f135918f55e31fe2b54c1cad91e8 1923920 libs optional libgcj5-common_3.4.1-7_all.deb
 c8d823597daf36260a1afa1dee247623 4046056 doc optional libstdc++6-doc_3.4.1-7_all.deb
 9f218f0813d2320515b171e9478ee8d4 628842 doc optional g77-3.4-doc_3.4.1-7_all.deb
 f59ca148b2d3839a640ca66205e97526 896350 doc optional gnat-3.4-doc_3.4.1-7_all.deb
 05e6024685ace08f3629d25587f3c6be 468718 doc optional gpc-2.1-3.4-doc_3.4.1-7_all.deb
 5b8e042fcc7102ae8017f815ca7f55c0 1464210 doc optional gcc-3.4-doc_3.4.1-7_all.deb
 130861b4849f1a16a460bd138f17681b 156562 devel optional gcc-3.4-base_3.4.1-7_i386.deb
 2f665dcc1d53a8c0110012b9958722b4 78264 libs required libgcc1_3.4.1-7_i386.deb
 0a13cfda1df73d90858bcc89a5277129 82336 libs optional lib64gcc1_3.4.1-7_i386.deb
 c23de396222f8aa0f7944ec94da97535 1702984 interpreters optional cpp-3.4_3.4.1-7_i386.deb
 11613d620b6fd6ff1758e0416d34f0dd 1741862 devel optional gobjc-3.4_3.4.1-7_i386.deb
 5184a01742b4daba1a9ce9009e2bbc3c 13242 devel optional gij-3.4_3.4.1-7_i386.deb
 dfae50ee56e771a16ca11daf9eb17625 3511118 libs optional libgcj5_3.4.1-7_i386.deb
 db5239a89208a843231a5eb876a31617 185370 libs optional libgcj5-awt_3.4.1-7_i386.deb
 ab084731bc8d78d9745320de4879dbe2 2039728 devel optional gcj-3.4_3.4.1-7_i386.deb
 4ab57deb392f7d597d07558126ec83f9 6567988 libdevel optional libgcj5-dev_3.4.1-7_i386.deb
 c02bda31fcfde2c0333c00909bcfdc8b 116996 devel optional fastjar_3.4.1-7_i386.deb
 d51bcb6d944441c77916a5a099ffe493 77254 libs optional libffi3_3.4.1-7_i386.deb
 c30c2d2d11682793b51aef5ff4b69e35 8848 libdevel optional libffi3-dev_3.4.1-7_i386.deb
 642a083b24b3cda16511c10870c4a4ab 1935538 devel optional g++-3.4_3.4.1-7_i386.deb
 7aee8cee8fe70c625ff162cc9c4f9481 325370 base optional lib64stdc++6_3.4.1-7_i386.deb
 6f7acaacea85c6c148dc55cfcc57b9b5 320794 base optional libstdc++6_3.4.1-7_i386.deb
 4b9c45a204d12918e096a7a7916e11e8 1322220 libdevel optional libstdc++6-dev_3.4.1-7_i386.deb
 3999623810888829849d8e3064045d28 760058 libdevel extra libstdc++6-pic_3.4.1-7_i386.deb
 641491d936c5dba2893406f03ce7aabf 8928400 libdevel extra libstdc++6-dbg_3.4.1-7_i386.deb
 1f02715dff7c448705f2a196765b067e 1858252 devel optional g77-3.4_3.4.1-7_i386.deb
 b4b7c2c620b10452fe40af6e89c48be8 727602 libs optional libgnat-3.4_3.4.1-7_i386.deb
 22655be582d1ea7155367ab2694cdf7e 7130256 devel optional gnat-3.4_3.4.1-7_i386.deb
 596a02a62f8d9224d10b343316eeaf85 2984466 devel optional treelang-3.4_3.4.1-7_i386.deb
 5eaf77232e4c99bef92c36fd6629fceb 2246190 devel optional gpc-2.1-3.4_3.4.1-7_i386.deb
 03d58cf27675b086d629602baa983a95 1383504 devel optional gcc-3.4_3.4.1-7_i386.deb

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

iD8DBQFBJKYiStlRaw+TLJwRAg9vAJ492e6akdYGSV8OHb2iAIE4Z0ikfACfaBTx
9qyl4AnlU5cltNGRrIHjYvk=
=YN+2
-----END PGP SIGNATURE-----



Reply to: