diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-24 19:47:59 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-24 19:47:59 +0000 |
| commit | 926a3df3bc1d4082c191f27c796b60df6a5170ec (patch) | |
| tree | 0b50bc541782512c902abeab54c4ced2df2665d1 /debian/rules.conf | |
| parent | cc3b0116e3ac0d05ecf8aea669559312d3ce6914 (diff) | |
| download | gcc-47-926a3df3bc1d4082c191f27c796b60df6a5170ec.tar.gz | |
- Don't apply g++-multiarch-incdir.diff for pre-multiarch builds
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6323 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.conf')
| -rw-r--r-- | debian/rules.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/rules.conf b/debian/rules.conf index a37e430..1cd304c 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -329,7 +329,8 @@ ifneq (,$(findstring gcc,$(PKGSOURCE))) endif AUTO_BUILD_DEP := m4, libtool, -AUTO_BUILD_DEP += autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), +#AUTO_BUILD_DEP += autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), +AUTO_BUILD_DEP += autoconf2.64, ifneq ($(DEB_CROSS),yes) JAVA_BUILD_DEP := libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev, |