diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 143 | ||||
| -rw-r--r-- | debian/rules.defs | 9 |
3 files changed, 132 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index 3041e27..1315009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -gcc-4.7 (4.7.3-12+dyson1) UNRELEASED; urgency=medium +gcc-4.7 (4.7.3-12+dyson1) unstable; urgency=medium * Install only fixed sys/nsctl/nsctl.h sys/feature_tests.h sys/int_const.h sys/int_limits.h; e. i. not sys/varargs.h, cause it breaks building kernel modules. + * Updated illumos-rdynamic.diff + * Do not build common libs and packages: switching to gcc-4.8 - -- Igor Pashev <pashev.igor@gmail.com> Fri, 18 Apr 2014 15:17:55 +0400 + -- Igor Pashev <pashev.igor@gmail.com> Sat, 19 Apr 2014 09:21:08 +0400 gcc-4.7 (4.7.3-12) unstable; urgency=medium diff --git a/debian/control b/debian/control index dfa0c82..34ae4e1 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org> Uploaders: Matthias Klose <doko@debian.org> Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base, - libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5) , libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32], libn32gcc1 [mips mipsel], lib64gcc1 [i386 mips mipsel powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], +Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base | gcc-4.7-base, + libc1-dev (>= 2.10-13) [illumos-amd64], libc1-dev-illumos-i386 (>= 2.10-13) [illumos-amd64], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base, texinfo (>= 4.3), sharutils, procps, netbase, libcloog-ppl-dev (>= 0.15.11), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), - dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt + dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12) | coreutils (>= 8.15), chrpath, lsb-release, quilt Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, Build-Conflicts: binutils-gold (<< 2.23.52.20130727) Homepage: http://gcc.gnu.org/ @@ -57,7 +57,7 @@ Description: GCC support library (64bit development files) building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. Package: lib32gcc-4.7-dev -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Section: libdevel Priority: optional Recommends: ${dep:libcdev} @@ -101,7 +101,7 @@ Description: GNU C compiler This is the GNU C compiler, a fairly portable optimizing compiler for C. Package: gcc-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarchdev}, ${shlibs:Depends}, ${misc:Depends} @@ -173,6 +173,14 @@ Description: GNU C preprocessor This package has been separated from gcc for the benefit of those who require the preprocessor but not the compiler. +Package: cpp-4.7-doc +Architecture: all +Section: doc +Priority: optional +Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Description: Documentation for the GNU C preprocessor (cpp) + Documentation for the GNU C preprocessor in info format. + Package: gcc-4.7-locales Architecture: all Section: devel @@ -197,7 +205,7 @@ Description: GNU C++ compiler This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. Package: g++-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), g++-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libcxxbiarchdev}, ${shlibs:Depends}, ${misc:Depends} @@ -208,6 +216,83 @@ Description: GNU C++ compiler (multilib files) On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s). +Package: libssp0 +Architecture: any +Multi-Arch: same +Pre-Depends: multiarch-support +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: GCC stack smashing protection library + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: lib32ssp0 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: libssp0 (<< 4.1) +Conflicts: ${confl:lib32} +Description: GCC stack smashing protection library (32bit) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: lib64ssp0 +Architecture: i386 powerpc sparc s390 mips mipsel x32 +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: libssp0 (<< 4.1) +Description: GCC stack smashing protection library (64bit) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: libn32ssp0 +Architecture: mips mipsel +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: libssp0 (<< 4.1) +Description: GCC stack smashing protection library (n32) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: libx32ssp0 +Architecture: amd64 i386 +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: libssp0 (<< 4.1) +Description: GCC stack smashing protection library (x32) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: libhfssp0 +Architecture: +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Description: GCC stack smashing protection library (hard float ABI) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +Package: libsfssp0 +Architecture: +Section: libs +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Description: GCC stack smashing protection library (soft float ABI) + GCC can now emit code for protecting applications from stack-smashing attacks. + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + Package: gobjc++-4.7 Architecture: any Priority: optional @@ -220,7 +305,7 @@ Description: GNU Objective-C++ compiler gcc backend to generate optimized code. Package: gobjc++-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), gobjc++-4.7 (= ${gcc:Version}), g++-4.7-multilib (= ${gcc:Version}), gobjc-4.7-multilib (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -243,7 +328,7 @@ Description: GNU Objective-C compiler gcc backend to generate optimized code. Package: gobjc-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), gobjc-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libobjcbiarchdev}, ${shlibs:Depends}, ${misc:Depends} @@ -276,7 +361,7 @@ Description: Runtime library for GNU Objective-C applications (64bit development GNU ObjC applications. Package: lib32objc-4.7-dev -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Section: libdevel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), lib32gcc-4.7-dev (= ${gcc:Version}), lib32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -317,7 +402,7 @@ Description: GNU Fortran compiler gcc backend to generate optimized code. Package: gfortran-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), gfortran-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libgfortranbiarchdev}, ${shlibs:Depends}, ${misc:Depends} @@ -328,6 +413,14 @@ Description: GNU Fortran compiler (multilib files) On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s). +Package: gfortran-4.7-doc +Architecture: all +Section: doc +Priority: optional +Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Description: Documentation for the GNU Fortran compiler (gfortran) + Documentation for the GNU Fortran compiler in info format. + Package: libgfortran-4.7-dev Architecture: any Section: libdevel @@ -352,7 +445,7 @@ Description: Runtime library for GNU Fortran applications (64bit development fil GNU Fortran applications. Package: lib32gfortran-4.7-dev -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Section: libdevel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), lib32gfortran3 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -396,7 +489,7 @@ Description: GNU Go compiler by the gcc compiler. It uses the gcc backend to generate optimized code. Package: gccgo-4.7-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 illumos-amd64 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), gccgo-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} @@ -408,6 +501,14 @@ Description: GNU Go compiler (multilib files) On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s). +Package: gccgo-4.7-doc +Architecture: all +Section: doc +Priority: optional +Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Description: Documentation for the GNU Go compiler (gccgo) + Documentation for the GNU Go compiler in info format. + Package: libgo0 Section: libs Architecture: any @@ -451,7 +552,7 @@ Description: Runtime library for GNU Go applications (64bit debug symbols) Package: lib32go0 Section: libs -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} Conflicts: ${confl:lib32} @@ -461,7 +562,7 @@ Description: Runtime library for GNU Go applications (32bit) Package: lib32go0-dbg Section: debug -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Priority: extra Depends: gcc-4.7-base (= ${gcc:Version}), lib32go0 (= ${gcc:Version}), ${misc:Depends} Description: Runtime library for GNU Go applications (32 bit debug symbols) @@ -548,7 +649,7 @@ Description: GNU Standard C++ Library v3 (debugging files) debugging symbols. Package: lib32stdc++6-4.7-dev -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Section: libdevel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), lib32gcc-4.7-dev (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), ${misc:Depends} @@ -563,7 +664,7 @@ Description: GNU Standard C++ Library v3 (development files) in g++-3.0. Package: lib32stdc++6-4.7-dbg -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 +Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 illumos-amd64 Section: debug Priority: extra Depends: gcc-4.7-base (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), lib32gcc1-dbg (>= ${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends} @@ -670,6 +771,16 @@ Description: GCC soft-floating-point gcc libraries (ARM) These are versions of basic static libraries such as libgcc.a compiled with the -msoft-float option, for CPUs without a floating-point unit. +Package: gcc-4.7-doc +Architecture: all +Section: doc +Priority: optional +Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Conflicts: gcc-docs (<< 2.95.2) +Replaces: gcc (<=2.7.2.3-4.3), gcc-docs (<< 2.95.2) +Description: Documentation for the GNU compilers (gcc, gobjc, g++) + Documentation for the GNU compilers in info format. + Package: gcc-4.7-source Architecture: all Priority: optional diff --git a/debian/rules.defs b/debian/rules.defs index 9596454..a344f17 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -348,12 +348,6 @@ else ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid maverick on with_common_libs := endif -# GCC 4.7 is the default compiler on Dyson -ifeq (illumos-amd64,$(DEB_HOST_ARCH)) -with_common_pkgs := yes -with_common_libs := yes -endif - # is this a multiarch-enabled build? ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick)) with_multiarch_lib := yes @@ -1277,8 +1271,7 @@ define gen_biarch export TARGET64_MACHINE endif endef -biarch32archs := /amd64/ppc64/kfreebsd-amd64/s390x/sparc64/x32/ -biarch32archs += illumos-amd64/ +biarch32archs := /amd64/ppc64/kfreebsd-amd64/s390x/sparc64/x32/illumos-amd64/ biarch64archs := /i386/powerpc/sparc/s390/mips/mipsel/x32/ biarchn32archs := /mips/mipsel/ ifeq ($(distribution),Ubuntu) |