./packages/libreoffice/3.3.0/experimental r2267: * debian/rules:
------------------------------------------------------------
revno: 2267
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Wed 2010-12-29 22:11:36 +0100
message:
* debian/rules:
- Move architecture specific config before distro specific config.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-29 20:40:55 +0000
+++ b/changelog 2010-12-29 21:11:36 +0000
@@ -8,6 +8,7 @@
[ Matthias Klose ]
* debian/rules:
- Cleanup architecture specific configuration handling.
+ - Move architecture specific config before distro specific config.
-- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 18:25:14 +0100
=== modified file 'rules'
--- a/rules 2010-12-29 20:40:55 +0000
+++ b/rules 2010-12-29 21:11:36 +0000
@@ -104,7 +104,7 @@
#########
# Default package configuration
#
-OOO_ARCHS = alpha amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -334,72 +334,6 @@
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
#############
-# Distro-specific overrides
-
-# Debian
-ifeq "$(DIST)" "Debian"
- # we don't need to build all languages and the thesaurus on the buildds;
- # they do binary-only builds anyway
- ifeq ($(ON_BUILDD),y)
- BUILD_ONLY_EN_US=y
- endif
-endif
-
-# Debian Lenny
-ifeq "$(LENNY_BACKPORT)" "y"
- BUGS=mailto:debian-backports@lists.debian.org
- USE_SYSTEM_LUCENE=n
- USE_SYSTEM_ICU=n
- MONO_MINVER= (>= 1.2.3)
- MONO2=n
- USE_SYSTEM_BOOST=n
- USE_SYSTEM_MDDS=n
- LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
- SUITESPARSE_MIN_VERSION= (>= 3.1.0)
- USE_SYSTEM_JFREEREPORT=n
- BUILD_KDE=y
-ifeq "$(BUILD_KDE)" "y"
- ENABLE_KDEAB=y
-endif
- KDE_VER=3
- CURL_SECTYPE=openssl
- HSQLDB_MINVER= (>> 1.8.0.9)
-ifneq (,$(filter ia64 mips% kfreebsd%, $(ARCH)))
- JDK=java-gcj-compat-dev
-endif
- DICT_DIR=/usr/share/myspell/dicts
- HYPH_DIR=/usr/share/myspell/dicts
- THES_DIR=/usr/share/myspell/dicts
- MOZILLA=iceape
- # only works with system-mysqlcppconn on lenny (the thing has a hardoced
- # so.16). And mysql-connector-c++ is not in lenny.
- ENABLE_MYSQLNATIVE=n
- USE_SYSTEM_REDLAND=n
- USE_SYSTEM_TEXTCAT_DATA=n
- USE_SYSTEM_LIBWPD=n
- USE_SYSTEM_LIBWPG=n
- USE_SYSTEM_LIBWPS=n
-endif
-
-# Debian Squeeze
-ifeq "$(SQUEEZE_BACKPORT)" "y"
- USE_SYSTEM_LIBWPD=n
- USE_SYSTEM_LIBWPG=n
- USE_SYSTEM_LIBWPS=n
- USE_EXTERNAL_MYTHES=n
- JUNIT_MIN_VER=
-endif
-
-# the archive only accepts bzip2 compressed members on 3.0 (quilt)
-ifeq "$(DEBSRC_VERSION)" "3.0"
- USE_BZIP_COMPRESS=y
- PRUNE_OOOBUILD=n
-else
- USE_BZIP_COMPRESS=n
- PRUNE_OOOBUILD=y
-endif
-
-#############
# Architecture-specific changes
LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
@@ -413,8 +347,8 @@
endif
ifeq "$(ENABLE_OPENGL)" "y"
- # doesn't make that much sense on arm(el) and mips(el), does it? :)
- OOO_OGLTRANS_ARCHS = $(filter-out arm% mips%, $(OOO_ARCHS))
+ # doesn't make that much sense on armel and mips(el), does it? :)
+ OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
@@ -487,6 +421,73 @@
endif
OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
+#############
+# Distro-specific overrides
+
+# Debian
+ifeq "$(DIST)" "Debian"
+ # we don't need to build all languages and the thesaurus on the buildds;
+ # they do binary-only builds anyway
+ ifeq ($(ON_BUILDD),y)
+ BUILD_ONLY_EN_US=y
+ endif
+endif
+
+# Debian Lenny
+ifeq "$(LENNY_BACKPORT)" "y"
+ BUGS=mailto:debian-backports@lists.debian.org
+ USE_SYSTEM_LUCENE=n
+ USE_SYSTEM_ICU=n
+ MONO_MINVER= (>= 1.2.3)
+ MONO2=n
+ USE_SYSTEM_BOOST=n
+ USE_SYSTEM_MDDS=n
+ LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
+ SUITESPARSE_MIN_VERSION= (>= 3.1.0)
+ USE_SYSTEM_JFREEREPORT=n
+ BUILD_KDE=y
+ifeq "$(BUILD_KDE)" "y"
+ ENABLE_KDEAB=y
+endif
+ KDE_VER=3
+ CURL_SECTYPE=openssl
+ HSQLDB_MINVER= (>> 1.8.0.9)
+ifneq (,$(filter ia64 mips% kfreebsd%, $(ARCH)))
+ JDK=java-gcj-compat-dev
+endif
+ DICT_DIR=/usr/share/myspell/dicts
+ HYPH_DIR=/usr/share/myspell/dicts
+ THES_DIR=/usr/share/myspell/dicts
+ MOZILLA=iceape
+ # only works with system-mysqlcppconn on lenny (the thing has a hardoced
+ # so.16). And mysql-connector-c++ is not in lenny.
+ ENABLE_MYSQLNATIVE=n
+ USE_SYSTEM_REDLAND=n
+ USE_SYSTEM_TEXTCAT_DATA=n
+ USE_SYSTEM_LIBWPD=n
+ USE_SYSTEM_LIBWPG=n
+ USE_SYSTEM_LIBWPS=n
+endif
+
+# Debian Squeeze
+ifeq "$(SQUEEZE_BACKPORT)" "y"
+ USE_SYSTEM_LIBWPD=n
+ USE_SYSTEM_LIBWPG=n
+ USE_SYSTEM_LIBWPS=n
+ USE_EXTERNAL_MYTHES=n
+ JUNIT_MIN_VER=
+endif
+
+# the archive only accepts bzip2 compressed members on 3.0 (quilt)
+ifeq "$(DEBSRC_VERSION)" "3.0"
+ USE_BZIP_COMPRESS=y
+ PRUNE_OOOBUILD=n
+else
+ USE_BZIP_COMPRESS=n
+ PRUNE_OOOBUILD=y
+endif
+
+
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
Reply to: