diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-08-06 14:37:45 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-08-06 14:37:45 +0000 |
| commit | a3585719bfb77e462fec86cea3374a6d939d3cf4 (patch) | |
| tree | 0d494652f6651e4fb77cfc144f7d62df787409cc | |
| parent | d0b776bb912b59d6e9e220768e460317b562ce34 (diff) | |
| download | gcc-49-a3585719bfb77e462fec86cea3374a6d939d3cf4.tar.gz | |
- make systemtap-sdt-dev build dependency conditional on the release.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7556 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/control.m4 | 6 | ||||
| -rw-r--r-- | debian/rules.conf | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 87222a1..4b97936 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mi kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], - systemtap-sdt-dev [i386 amd64 x32 ia64 s390 powerpc powerpcspe ppc64 armel armhf arm64], - autogen, zlib1g-dev, gawk, lzma, xz-utils, patchutils, + autogen, gawk, lzma, xz-utils, patchutils, + zlib1g-dev, systemtap-sdt-dev [linux-any kfreebsd-any hurd-any], binutils (>= 2.23.52) | binutils-multiarch (>= 2.23.52), binutils-hppa64 (>= 2.23.52) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, gdb, diff --git a/debian/control.m4 b/debian/control.m4 index 68ea5b5..5618ca0 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -58,10 +58,10 @@ Build-Depends: debhelper (>= 5.0.62), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP - systemtap-sdt-dev [i386 amd64 x32 ia64 s390 powerpc powerpcspe ppc64 ppc64el armel armhf arm64], SOURCE_BUILD_DEP CROSS_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP, autogen, zlib1g-dev, gawk, lzma, xz-utils, patchutils, + zlib1g-dev, SDT_BUILD_DEP bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, quilt ',`dnl native Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP @@ -69,8 +69,8 @@ Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], AUTO_BUILD_DEP BASE_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], - systemtap-sdt-dev [i386 amd64 x32 ia64 s390 powerpc powerpcspe ppc64 armel armhf arm64], - autogen, zlib1g-dev, gawk, lzma, xz-utils, patchutils, + autogen, gawk, lzma, xz-utils, patchutils, + zlib1g-dev, SDT_BUILD_DEP BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSBDV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, gdb, diff --git a/debian/rules.conf b/debian/rules.conf index 5cb6f9d..60a9add 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -382,6 +382,10 @@ CHECK_BUILD_DEP := dejagnu [$(check_no_archs)], AUTO_BUILD_DEP := m4, libtool, AUTO_BUILD_DEP += autoconf2.64, +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty)) + SDT_BUILD_DEP = systemtap-sdt-dev [linux-any kfreebsd-any hurd-any], +endif + # ensure that the common libs, built from the next GCC version are available ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) ifneq ($(with_common_libs),yes) @@ -595,6 +599,7 @@ ctrl_flags += \ -DLIBC_BUILD_DEP="$(LIBC_BUILD_DEP)" \ -DCHECK_BUILD_DEP="$(CHECK_BUILD_DEP)" \ -DAUTO_BUILD_DEP="$(AUTO_BUILD_DEP)" \ + -DSDT_BUILD_DEP="$(SDT_BUILD_DEP)" \ -DCLOOG_BUILD_DEP="$(CLOOG_BUILD_DEP)" \ -DGMP_BUILD_DEP="$(GMP_BUILD_DEP)" \ -DMPFR_BUILD_DEP="$(MPFR_BUILD_DEP)" \ |