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

Re: Compiling new gcc-3.x debs



On 04-May-12 06:58, Goswin von Brederlow wrote:
> who did build the gcc debs? Latest gcc-3.3 sid version is 3.3.3ds6-7
> and alioth has 3.3.3ds6-6.pure64.1. I didn't see bugs in the BTS for
> amd64 so the maintainer is probably unaware of the FTBFS problems.

The attached patch is similar to the pure64.1 patch and works for me.

Regards
Andreas Jochens

diff -urN ../tmp-orig/gcc-3.3-3.3.3ds6/debian/control ./debian/control
--- ../tmp-orig/gcc-3.3-3.3.3ds6/debian/control	2004-05-10 07:03:19.671042224 +0200
+++ ./debian/control	2004-05-10 07:03:11.779241960 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian GCC maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>, Gerhard Tonn <gt@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: libc6.1-dev (>= 2.3.1) [alpha ia64] | libc0.3-dev [hurd-i386] | libc1-dev [freebsd-i386] | libc12-dev [netbsd-i386] | libc6-dev (>= 2.3.2.ds1-12) [hppa] | libc6-dev (>= 2.3.1) [!hppa], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hurd-i386], expect (>= 5.38.0) [!hurd-i386], bzip2, binutils (>= 2.14.90.0.4) | binutils (<< 2.14), binutils (>= 2.13.90.0.10) [!m68k !sparc] | binutils (>= 2.13.90.0.18-1.3) [m68k] | binutils (>= 2.13.90.0.18-1.4) [sparc], binutils-hppa64 [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875a-1) | bison (<< 1:1.50), flex-old | flex (<< 2.5.31), gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr !freebsd-i386], xlibs-dev, gnat-3.3 [!arm !hurd-i386 !m68k !freebsd-i386 !netbsd-i386] | gnat-3.2 [!arm !hurd-i386 !m68k !freebsd-i386 !netbsd-i386] | gnat [i386 powerpc sparc], libncurses5-dev [!netbsd-i386], libgmp3-dev, tetex-bin [!netbsd-i386], locales [!netbsd-i386 !hurd-i386 !hurd-i386], gcc-2.95 [m68k], procps [!hurd-i386], help2man, sharutils
+Build-Depends: libc6.1-dev (>= 2.3.1) [alpha ia64] | libc0.3-dev [hurd-i386] | libc1-dev [freebsd-i386] | libc12-dev [netbsd-i386] | libc6-dev (>= 2.3.2.ds1-12) [hppa] | libc6-dev (>= 2.3.1) [!hppa], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hurd-i386], expect (>= 5.38.0) [!hurd-i386], bzip2, binutils (>= 2.14.90.0.4) | binutils (<< 2.14), binutils (>= 2.13.90.0.10) [!m68k !sparc] | binutils (>= 2.13.90.0.18-1.3) [m68k] | binutils (>= 2.13.90.0.18-1.4) [sparc], binutils-hppa64 [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875a-1) | bison (<< 1:1.50), flex-old | flex (<< 2.5.31), gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr !freebsd-i386], xlibs-dev, gnat-3.3 [!amd64 !arm !hurd-i386 !m68k !freebsd-i386 !netbsd-i386 !amd64] | gnat-3.2 [!amd64 !arm !hurd-i386 !m68k !freebsd-i386 !netbsd-i386 !amd64] | gnat [i386 powerpc sparc], libncurses5-dev [!netbsd-i386], libgmp3-dev, tetex-bin [!netbsd-i386], locales [!netbsd-i386 !hurd-i386 !hurd-i386], gcc-2.95 [m68k], procps [!hurd-i386], help2man, sharutils
 Build-Depends-Indep: doxygen (>= 1.3.6.20040222)
 
 Package: gcc-3.3-base
diff -urN ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules.d/binary-libstdcxx.mk ./debian/rules.d/binary-libstdcxx.mk
--- ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules.d/binary-libstdcxx.mk	2004-05-10 07:03:19.657044352 +0200
+++ ./debian/rules.d/binary-libstdcxx.mk	2004-05-10 01:19:17.000000000 +0200
@@ -336,10 +336,10 @@
 
 	cp -a $(doxygen_doc_dir)/html_user \
 		$(d_libd)/$(docdir)/$(p_base)/libstdc++/.
-	cp -a $(doxygen_doc_dir)/man/man3 \
-		$(d_libd)/$(PF)/share/man/.
-	cp -p $(srcdir)/libstdc++-v3/docs/doxygen/Intro.3 \
-		$(d_libd)/$(PF)/share/man/man3/C++Intro.3
+#	cp -a $(doxygen_doc_dir)/man/man3 \
+#		$(d_libd)/$(PF)/share/man/.
+#	cp -p $(srcdir)/libstdc++-v3/docs/doxygen/Intro.3 \
+#		$(d_libd)/$(PF)/share/man/man3/C++Intro.3
 
 #	mkdir -p $(d_libd)/usr/share/lintian/overrides
 #	cp -p debian/$(p_libd).overrides \
diff -urN ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules.defs ./debian/rules.defs
--- ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules.defs	2004-05-10 07:03:19.684040248 +0200
+++ ./debian/rules.defs	2004-05-10 01:19:17.000000000 +0200
@@ -386,7 +386,7 @@
 endif
 
 with_libgnat := yes
-ada_no_archs := arm hurd-i386 m68k freebsd-i386 netbsd-i386
+ada_no_archs := arm hurd-i386 m68k freebsd-i386 netbsd-i386 amd64
 ifneq ($(DEB_TARGET_ARCH),i386)
   ifeq ($(DEB_TARGET_ARCH), $(findstring $(DEB_TARGET_ARCH),$(ada_no_archs)))
     with_ada := disabled for architecure $(DEB_TARGET_ARCH)
diff -urN ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules2 ./debian/rules2
--- ../tmp-orig/gcc-3.3-3.3.3ds6/debian/rules2	2004-05-10 07:03:19.692039032 +0200
+++ ./debian/rules2	2004-05-10 01:19:17.000000000 +0200
@@ -122,6 +122,10 @@
   endif
 endif
 
+ifeq ($(DEB_TARGET_ARCH),amd64)
+  CONFARGS += --disable-multilib
+endif
+
 ifndef DEB_CROSS
   CONFARGS += $(TARGET_ALIAS)
 else
@@ -845,6 +849,14 @@
 
 	mkdir -p $(d)/lib $(d)/bin $(d)/$(PF)/share/{doc,info,man/man1}
 
+ifeq ($(DEB_TARGET_ARCH),amd64)
+	# 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) \



Reply to: