------------------------------------------------------------ revno: 1697 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Thu 2009-10-08 18:23:12 +0200 message: - build-depend on binutils (>= 2.20) and g{cc,++}-4.4 (>= 4.4.1-6) for armel, see http://gcc.gnu.org/PR40521 modified: changelog rules
=== modified file 'changelog' --- a/changelog 2009-10-07 23:04:05 +0000 +++ b/changelog 2009-10-08 16:23:12 +0000 @@ -6,6 +6,8 @@ * debian/control.in: - move -style-* recommends at -common to suggests (closes: #550126) - build-depend on po-debconf + - build-depend on binutils (>= 2.20) and g{cc,++}-4.4 (>= 4.4.1-6) for + armel, see http://gcc.gnu.org/PR40521 -- Rene Engelhard <r...@debian.org> Wed, 07 Oct 2009 21:41:56 +0200
=== modified file 'rules' --- a/rules 2009-10-03 23:52:16 +0000 +++ b/rules 2009-10-08 16:23:12 +0000 @@ -464,6 +464,11 @@ ifeq (s390,$(findstring s390,$(OOO_ARCHS))) BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] endif +ifeq (armel,$(findstring armel,$(OOO_ARCHS))) + ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4" + BUILD_DEPS += , binutils (>= 2.20) [armel], gcc-4.4 (>= 4.1.1-6) [armel], g++-4.4 (>= 4.1.1-6) [armel] + endif +endif OOO_MOZILLA_ARCHS=i386 powerpc mips mipsel s390 arm armel ifeq "$(BUILD_AMD64)" "y"