diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-31 12:50:51 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-31 12:50:51 +0000 |
| commit | 4c6b72d32ce1fe97941a7e018502ef37185081f2 (patch) | |
| tree | 332aab5081c6341102bf572862c7a9c10f221ebb /debian | |
| parent | 947d11c3b22a14319add6a938ee01b5549f13bd9 (diff) | |
| download | gcc-5-4c6b72d32ce1fe97941a7e018502ef37185081f2.tar.gz | |
* Don't build libmpx on older releases.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7937 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.defs | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 19b3943..14fbfce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gcc-5 (5-20150329-2) UNRELEASED; urgency=medium so the toolchain remains relocatible. Instead, canonicalize the include path names at runtime. * Don't link libgnatprj using --no-allow-shlib-undefined on older releases. + * Don't build libmpx on older releases. -- Matthias Klose <doko@ubuntu.com> Tue, 31 Mar 2015 14:40:11 +0200 diff --git a/debian/rules.defs b/debian/rules.defs index ea6a998..44c0e0a 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1117,9 +1117,12 @@ with_mpx := with_mpx := $(call envfilt, mpx, , , $(with_mpx)) mpx_archs = amd64 i386 ifneq (,$(filter $(DEB_TARGET_ARCH),$(mpx_archs))) - with_mpx := yes - ifneq (,$(findstring gcc-, $(PKGSOURCE))) - with_libmpx := yes + # requires newer binutils, or else libmpxwrappers isn't built + ifeq (,$(filter $(distrelease),squeeze lucid precise)) + with_mpx := yes + ifneq (,$(findstring gcc-, $(PKGSOURCE))) + with_libmpx := yes + endif endif endif |