./packages/libreoffice/3.3.0/experimental r2277: * debian/rules:
------------------------------------------------------------
revno: 2277
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Thu 2010-12-30 19:14:00 +0100
message:
* debian/rules:
- Factor out SYSTEM_GCC_VERSION macro.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-30 17:34:26 +0000
+++ b/changelog 2010-12-30 18:14:00 +0000
@@ -20,6 +20,7 @@
- Avoid over long lines in build dependencies.
- Add a helper macro gen_no_archs to generate macros OOO_NO_<foo>_ARCHS
from OOO_<foo>_ARCHS. Use these macros in build dependencies.
+ - Factor out SYSTEM_GCC_VERSION macro.
* debian/control.in:
- Remove packages and versions in build dependencies,
which are present in the last old stable release.
=== modified file 'rules'
--- a/rules 2010-12-30 17:34:26 +0000
+++ b/rules 2010-12-30 18:14:00 +0000
@@ -44,6 +44,8 @@
DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
SHELL:=/bin/bash
+SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
+
# Debian buildds run as user `buildd', other are using /CurrentlyBuilding
ON_BUILDD := $(shell [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] && echo y || echo n)
@@ -509,7 +511,7 @@
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390]
endif
-ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
+ifeq "$(SYSTEM_GCC_VERSION" "4.4"
ifeq (armel,$(findstring armel,$(OOO_ARCHS)))
BUILD_DEPS += , g++-4.4 (>= 4.4.2-5) [armel]
endif
@@ -613,7 +615,7 @@
else
SMALL_SYMBOLS = y
endif
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head -n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
else
@@ -949,7 +951,7 @@
ifeq "$(USE_SYSTEM_BOOST)" "y"
ifeq "$(BOOST_VERSION)" "1.34"
- ifeq "$(shell gcc --version | head -n 1 | cut -d' ' -f4 | cut -d. -f1,2)" "4.4"
+ ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
BUILD_DEPS += , libboost-dev (>= 1.34.1-15)
else
BUILD_DEPS += , libboost-dev
@@ -1757,7 +1759,7 @@
perl -pi -e "s/(Build-Conflicts: .*)/\1, libstlport4.6-dev/" debian/control
endif
-ifeq (4.4,$(shell LANG="C" gcc --version | head -n 1 | awk '{ print $$4 }'))
+ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
Reply to: