diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-13 19:55:14 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-13 19:55:14 +0000 |
| commit | 9b27014a37b014e59c97105a0dc86d58413496bd (patch) | |
| tree | 09c64731e0fa6e19baca63e04c32e19827071506 /debian | |
| parent | e19069332788a42c9f325e63e772368afa7bfe94 (diff) | |
| download | gcc-48-9b27014a37b014e59c97105a0dc86d58413496bd.tar.gz | |
- re-add gcc-multilib b-d. this is now a test-only b-d.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6564 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.m4 | 2 | ||||
| -rw-r--r-- | debian/rules.conf | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/debian/control b/debian/control index bfa9834..a009305 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org> Uploaders: Matthias Klose <doko@debian.org> Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 5.0.62), +Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32], 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-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 x32], lib64gcc1 [i386 powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], diff --git a/debian/control.m4 b/debian/control.m4 index 7fa72e7..27edaa5 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -57,7 +57,7 @@ Build-Depends: debhelper (>= 5.0.62), zlib1g-dev, gawk, lzma, xz-utils, patchutils, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, quilt ',`dnl native -Build-Depends: debhelper (>= 5.0.62), +Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTO_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], diff --git a/debian/rules.conf b/debian/rules.conf index dff7d21..52e8765 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -310,6 +310,10 @@ else endif endif +# needed for the include/asm symlink to run the testsuite for +# non default multilibs +GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)], + LIBUNWIND_DEV_DEP := libunwind7-dev$(LS)$(AQ) (>= 0.98.5-6) LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64], LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64], @@ -565,6 +569,7 @@ ctrl_flags += \ -DDPKG_BUILD_DEP="$(DPKG_BUILD_DEP)" \ -DSOURCE_BUILD_DEP="$(SOURCE_BUILD_DEP)" \ -DCROSS_BUILD_DEP="$(CROSS_BUILD_DEP)" \ + -DGCC_MULTILIB_BUILD_DEP='$(GCC_MULTILIB_BUILD_DEP)' \ -DMULTILIB_ARCHS="$(multilib_archs)" \ -DNEON_ARCHS="$(neon_archs)" \ -DTP=$(TP) \ |