diff options
author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-03 13:16:37 +0000 |
---|---|---|
committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-03 13:16:37 +0000 |
commit | 8284b131516a8481f5e21eb89895560f6b3164a1 (patch) | |
tree | b5e1c6bfd63ae1a88de12bffdbb20a45df6d8efb | |
parent | e967aa2b626d541fecd9453becd2a5227e56a84a (diff) | |
download | gcc-5-8284b131516a8481f5e21eb89895560f6b3164a1.tar.gz |
* gccgo-5: Install alternatives for go and gofmt.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7868 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/control | 86 | ||||
-rw-r--r-- | debian/control.m4 | 1 | ||||
-rw-r--r-- | debian/gccgo-BV.postinst | 16 | ||||
-rw-r--r-- | debian/gccgo-BV.prerm | 19 | ||||
-rw-r--r-- | debian/rules.conf | 1 |
6 files changed, 42 insertions, 88 deletions
diff --git a/debian/changelog b/debian/changelog index 77d8a6c..46bb57d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -gcc-5 (5-20150302-1) experimental; urgency=medium +gcc-5 (5-20150303-1) experimental; urgency=medium - * Update to SVN 20150302. + * Update to SVN 20150303. * Enable libsanitizer for AArch64 and POWERPC LE (asan, ubsan). * Remove the support to build empty libsanitizer packages on powerpc and ppc64; libsanitizer should be stable on these architectures. @@ -9,8 +9,9 @@ gcc-5 (5-20150302-1) experimental; urgency=medium * Don't strip the libgo library, or some things won't work as documented, like runtime.Callers. Still keep the -dbg packages and check if some debug information can be stripped. + * gccgo-5: Install alternatives for go and gofmt. - -- Matthias Klose <doko@debian.org> Mon, 02 Mar 2015 13:35:08 +0100 + -- Matthias Klose <doko@debian.org> Tue, 03 Mar 2015 11:34:55 +0100 gcc-5 (5-20150226-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 4a138e0..5147119 100644 --- a/debian/control +++ b/debian/control @@ -1569,6 +1569,7 @@ Priority: optional Depends: gcc-5-base (= ${gcc:Version}), gcc-5 (= ${gcc:Version}), libgo7 (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Provides: go-compiler Suggests: ${go:multilib}, gccgo-5-doc, libgo7-dbg (>= ${gcc:Version}) +Conflicts: gccgo-go, ${golang:Conflicts} Description: GNU Go compiler This is the GNU Go compiler, which compiles Go on platforms supported by the gcc compiler. It uses the gcc backend to generate optimized code. @@ -2083,91 +2084,6 @@ Description: GNU Standard C++ Library v3 (documentation files) alphabetical list, compound list, file list, namespace members, compound members and file members. -Package: gdc-5 -Architecture: any -Priority: optional -Depends: gcc-5-base (>= ${gcc:SoftVersion}), g++-5 (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends} -Provides: gdc, d-compiler, d-v2-compiler -Replaces: gdc (<< 4.4.6-5) -Description: GNU D compiler (version 2) - This is the GNU D compiler, which compiles D on platforms supported by gcc. - It uses the gcc backend to generate optimised code. - . - This compiler supports D language version 2. - -Package: gdc-5-multilib -Architecture: any -Priority: optional -Depends: gcc-5-base (>= ${gcc:SoftVersion}), gdc-5 (= ${gcc:Version}), gcc-5-multilib (= ${gcc:Version}), ${dep:libphobosbiarchdev}${shlibs:Depends}, ${misc:Depends} -Description: GNU D compiler (version 2, multilib files) - This is the GNU D compiler, which compiles D on platforms supported by gcc. - It uses the gcc backend to generate optimised code. - . - On architectures with multilib support, the package contains files - and dependencies for the non-default multilib architecture(s). - -Package: libphobos-5-dev -Architecture: amd64 armel armhf i386 x32 kfreebsd-amd64 kfreebsd-i386 -Section: libdevel -Priority: optional -Depends: gcc-5-base (= ${gcc:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends} -Description: Phobos D standard library - This is the Phobos standard library that comes with the D2 compiler. - . - For more information check http://www.dlang.org/phobos/ - -#Package: libphobos`'PHOBOS_V`'PV`'TS-dbg -#Section: debug -#Architecture: ifdef(`TARGET',`CROSS_ARCH',`libphobos_archs') -#Priority: extra -#Depends: BASEDEP, libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}), ${misc:Depends} -#Provides: libphobos`'PHOBOS_V`'TS-dbg -#BUILT_USING`'dnl -#Description: The Phobos D standard library (debug symbols) -# This is the Phobos standard library that comes with the D2 compiler. -# . -# For more information check http://www.dlang.org/phobos/ - -Package: lib64phobos-5-dev -Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32 -Section: libdevel -Priority: optional -Depends: gcc-5-base (= ${gcc:Version}), lib64gcc-5-dev (= ${gcc:Version}), lib64z1-dev, ${shlibs:Depends}, ${misc:Depends} -Description: Phobos D standard library (64bit development files) - This is the Phobos standard library that comes with the D2 compiler. - . - For more information check http://www.dlang.org/phobos/ - -Package: lib32phobos-5-dev -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el -Section: libdevel -Priority: optional -Depends: gcc-5-base (= ${gcc:Version}), lib32gcc-5-dev (= ${gcc:Version}), lib32z1-dev, ${shlibs:Depends}, ${misc:Depends} -Description: Phobos D standard library (64bit development files) - This is the Phobos standard library that comes with the D2 compiler. - . - For more information check http://www.dlang.org/phobos/ - -Package: libn32phobos-5-dev -Architecture: mips mipsel mips64 mips64el -Section: libdevel -Priority: optional -Depends: gcc-5-base (= ${gcc:Version}), libn32gcc-5-dev (= ${gcc:Version}), libn32z1-dev, ${shlibs:Depends}, ${misc:Depends} -Description: Phobos D standard library (n32 development files) - This is the Phobos standard library that comes with the D2 compiler. - . - For more information check http://www.dlang.org/phobos/ - -Package: libx32phobos-5-dev -Architecture: amd64 i386 -Section: libdevel -Priority: optional -Depends: gcc-5-base (= ${gcc:Version}), libx32gcc-5-dev (= ${gcc:Version}), libx32z1-dev, ${shlibs:Depends}, ${misc:Depends} -Description: Phobos D standard library (x32 development files) - This is the Phobos standard library that comes with the D2 compiler. - . - For more information check http://www.dlang.org/phobos/ - #Package: gcc`'PV-soft-float #Architecture: arm armel armhf #Priority: PRI(optional) diff --git a/debian/control.m4 b/debian/control.m4 index 1517e75..aa46a86 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -3663,6 +3663,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libdep(go`'GO_SO,), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Provides: go-compiler Suggests: ${go:multilib}, gccgo`'PV-doc, libdbgdep(go`'GO_SO-dbg,) +Conflicts: gccgo-go, ${golang:Conflicts} BUILT_USING`'dnl Description: GNU Go compiler This is the GNU Go compiler, which compiles Go on platforms supported diff --git a/debian/gccgo-BV.postinst b/debian/gccgo-BV.postinst new file mode 100644 index 0000000..0086d88 --- /dev/null +++ b/debian/gccgo-BV.postinst @@ -0,0 +1,16 @@ +#! /bin/sh -e + +# see #779503, base version (50) + go version (1.4) +prio=54 + +case "$1" in + configure) + update-alternatives \ + --install /usr/bin/go go /usr/bin/go-@BV@ $prio \ + --slave /usr/bin/gofmt gofmt /usr/bin/gofmt-@BV@ + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/gccgo-BV.prerm b/debian/gccgo-BV.prerm new file mode 100644 index 0000000..fd12afc --- /dev/null +++ b/debian/gccgo-BV.prerm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --remove go /usr/bin/go-@BV@ + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules.conf b/debian/rules.conf index e3bdf45..e9a09ec 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1165,6 +1165,7 @@ endif ifeq ($(with_multiarch_lib),yes) echo 'multiarch:breaks=gcc-4.3 (<< 4.3.6-1), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2)' >> debian/substvars.local.tmp endif + echo 'golang:Conflicts=golang-go (<< 2:1.3.3-1ubuntu2)' >> debian/substvars.local.tmp ifeq ($(add_built_using),yes) echo "Built-Using=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W gcc$(pkg_ver)-source)" \ >> debian/substvars.local.tmp |