diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-05 14:13:08 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-05 14:13:08 +0000 |
| commit | bcf90241550f1a74ed692f9e92e9612abf2ff279 (patch) | |
| tree | 3e2623d05e096ee3482459337448f5c0388c3b84 /debian | |
| parent | 831568bb9163adcd7a59f5072605f97b8e8d3b46 (diff) | |
| download | gcc-5-bcf90241550f1a74ed692f9e92e9612abf2ff279.tar.gz | |
* libx32phobos-dev: Don't depend on libx32z-dev, when not available.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8027 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.m4 | 2 | ||||
| -rw-r--r-- | debian/rules.conf | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4b68d91..32de9af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ gcc-5 (5.1.1-5) UNRELEASED; urgency=medium * Update to SVN 20150504 (r222779, 5.1.1) from the gcc-5-branch. * Fix 32bit libstdc++ symbols files for kfreebsd-amd64. + * libx32phobos-dev: Don't depend on libx32z-dev, when not available. -- Matthias Klose <doko@debian.org> Mon, 04 May 2015 14:02:29 +0200 diff --git a/debian/control b/debian/control index 026ba86..3724339 100644 --- a/debian/control +++ b/debian/control @@ -2400,7 +2400,7 @@ 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} +Depends: gcc-5-base (= ${gcc:Version}), libx32gcc-5-dev (= ${gcc:Version}), ${dep:libx32z}, ${shlibs:Depends}, ${misc:Depends} Description: Phobos D standard library (x32 development files) This is the Phobos standard library that comes with the D2 compiler. . diff --git a/debian/control.m4 b/debian/control.m4 index 50c27ef..acaa8b6 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -5132,7 +5132,7 @@ Package: libx32phobos`'PV-dev`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs') Section: libdevel Priority: PRI(optional) -Depends: BASEDEP, libdevdep(gcc`'PV-dev,x32), libx32z1-dev, ${shlibs:Depends}, ${misc:Depends} +Depends: BASEDEP, libdevdep(gcc`'PV-dev,x32), ${dep:libx32z}, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl Description: Phobos D standard library (x32 development files) This is the Phobos standard library that comes with the D2 compiler. diff --git a/debian/rules.conf b/debian/rules.conf index 7c8aa0e..9032d8f 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1101,6 +1101,10 @@ ifeq ($(with_qmath),yes) echo 'dep:libqmath=libquadmath$(QUADMATH_SONAME)$(LS)$(AQ) (>= $${gcc:Version})' \ >> debian/substvars.local.tmp endif +ifeq ($(distribution),Debian) + echo 'dep:libx32z=$(if $(filter $(distribution), Debian),,libx32z1-dev)' \ + >> debian/substvars.local.tmp +endif ifeq ($(multilib),yes) echo 'dep:libgfortranbiarchdev=$(libgfortranbiarchdev)' \ >> debian/substvars.local.tmp |