./packages/libreoffice/3.3.0/experimental r2265: * debian/rules:
------------------------------------------------------------
revno: 2265
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Wed 2010-12-29 21:40:55 +0100
message:
* debian/rules:
- Cleanup architecture specific configuration handling.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-29 17:28:03 +0000
+++ b/changelog 2010-12-29 20:40:55 +0000
@@ -1,9 +1,14 @@
libreoffice (1:3.3.0~rc2-3) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* merge OOo lenny-backport fixes
+ keep 3.0 (quilt) for lenny-backports now that it supports it
+ really use internal mythes
+ [ Matthias Klose ]
+ * debian/rules:
+ - Cleanup architecture specific configuration handling.
+
-- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 18:25:14 +0100
libreoffice (1:3.3.0~rc2-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-12-29 17:28:03 +0000
+++ b/rules 2010-12-29 20:40:55 +0000
@@ -104,15 +104,7 @@
#########
# Default package configuration
#
-BUILD_AMD64=y
-BUILD_IA64=y
-BUILD_PPC64=y
-BUILD_S390X=y
-BUILD_SPARC=y
-BUILD_ARMEL=y
-BUILD_HPPA=y
-BUILD_ALPHA=y
-BUILD_KFREEBSD=y
+OOO_ARCHS = alpha amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -131,28 +123,15 @@
export PYTHON=python$(PYTHON_VERSION)
endif
PACKAGE_TTF_OPENSYMBOL=y
-ifneq "$(ARCH)" "powerpc"
- ifneq "$(ARCH)" "ppc64"
- ifneq "$(ARCH)" "powerpcspe"
- BUILD_JARS_NATIVE=y
- endif
- endif
+ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
+ BUILD_JARS_NATIVE=y
endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
- ifeq "$(ARCH)" "ia64"
- JDK=gcj-jdk
- endif
- ifneq (,$(findstring mips,$(ARCH)))
- JDK=gcj-jdk
- endif
- ifneq (,$(findstring kfreebsd,$(ARCH)))
- JDK=gcj-jdk
- endif
- ifeq "$(ARCH)" "hppa"
+ ifneq (,$(filter hppa ia64 mips% kfreebsd%, $(ARCH)))
JDK=gcj-jdk
endif
endif
@@ -385,13 +364,7 @@
KDE_VER=3
CURL_SECTYPE=openssl
HSQLDB_MINVER= (>> 1.8.0.9)
-ifeq "$(ARCH)" "ia64"
- JDK=java-gcj-compat-dev
-endif
-ifneq (,$(findstring mips,$(ARCH)))
- JDK=java-gcj-compat-dev
-endif
-ifneq (,$(findstring kfreebsd,$(ARCH)))
+ifneq (,$(filter ia64 mips% kfreebsd%, $(ARCH)))
JDK=java-gcj-compat-dev
endif
DICT_DIR=/usr/share/myspell/dicts
@@ -440,109 +413,20 @@
endif
ifeq "$(ENABLE_OPENGL)" "y"
-# doesn't make that much sense on arm(el) and mips(el), does it? :)
-OOO_OGLTRANS_ARCHS= i386 powerpc powerpcspe s390
-ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_OGLTRANS_ARCHS+= kfreebsd-i386
-endif
-ifeq "$(BUILD_AMD64)" "y"
- OOO_OGLTRANS_ARCHS+= amd64
- ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_OGLTRANS_ARCHS+= kfreebsd-amd64
- endif
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_OGLTRANS_ARCHS+= ia64
-endif
-ifeq "$(BUILD_PPC64)" "y"
- OOO_OGLTRANS_ARCHS+= ppc64
-endif
-ifeq "$(BUILD_S390X)" "y"
- OOO_OGLTRANS_ARCHS+= s390x
-endif
-ifeq "$(BUILD_SPARC)" "y"
- OOO_OGLTRANS_ARCHS+= sparc
-endif
-ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
+ # doesn't make that much sense on arm(el) and mips(el), does it? :)
+ OOO_OGLTRANS_ARCHS = $(filter-out arm% mips%, $(OOO_ARCHS))
+ ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
-endif
-else
- OOO_OGLTRANS_ARCHS=
-endif
-
-OOO_ARCHS= i386 m68k mips mipsel powerpc powerpcspe s390
-ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_ARCHS += kfreebsd-i386
-endif
-ifeq "$(BUILD_ALPHA)" "y"
- OOO_ARCHS += alpha
- OOO_64BIT_ARCHS += alpha
-endif
-ifeq "$(BUILD_AMD64)" "y"
- OOO_ARCHS += amd64
- OOO_64BIT_ARCHS += amd64
- ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_ARCHS += kfreebsd-amd64
- OOO_64BIT_ARCHS += kfreebsd-amd64
endif
endif
-ifeq "$(BUILD_ARMEL)" "y"
- OOO_ARCHS += armel
-endif
-ifeq "$(BUILD_HPPA)" "y"
- OOO_ARCHS += hppa
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_ARCHS += ia64
- OOO_64BIT_ARCHS += ia64
-endif
-ifeq "$(BUILD_PPC64)" "y"
- OOO_ARCHS += ppc64
- OOO_64BIT_ARCHS += ppc64
-endif
-ifeq "$(BUILD_S390X)" "y"
- OOO_ARCHS += s390x
- OOO_64BIT_ARCHS += s390x
-endif
-ifeq "$(BUILD_SPARC)" "y"
- OOO_ARCHS += sparc
-endif
+
+OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
-OOO_JAVA_ARCHS = i386 mips mipsel powerpc powerpcspe s390
-ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_JAVA_ARCHS+= kfreebsd-i386
-endif
-ifeq "$(BUILD_ALPHA)" "y"
- OOO_JAVA_ARCHS+= alpha
-endif
-ifeq "$(BUILD_AMD64)" "y"
- OOO_JAVA_ARCHS+= amd64
- ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_JAVA_ARCHS+= kfreebsd-amd64
- endif
-endif
-ifeq "$(BUILD_ARMEL)" "y"
- OOO_JAVA_ARCHS+= armel
-endif
-ifeq "$(BUILD_HPPA)" "y"
- OOO_JAVA_ARCHS+= hppa
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_JAVA_ARCHS+= ia64
-endif
-ifeq "$(BUILD_PPC64)" "y"
- OOO_JAVA_ARCHS+= ppc64
-endif
-ifeq "$(BUILD_S390X)" "y"
- OOO_JAVA_ARCHS+= s390x
-endif
-ifeq "$(BUILD_SPARC)" "y"
- OOO_JAVA_ARCHS+= sparc
-endif
+OOO_JAVA_ARCHS = $(OOO_ARCHS)
# gcj does not work on ppc, so no need to build -gcj for it
-OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpcspe,$(filter-out powerpc,$(OOO_JAVA_ARCHS))))
+OOO_GCJ_ARCHS = $(filter-out powerpc powerpcspe ppc64, $(OOO_JAVA_ARCHS))
OOO_GCJ_JDK_ARCHS := hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
@@ -574,39 +458,17 @@
ENABLE_MYSQLNATIVE=n
endif
-ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
- ENABLE_JAVA=n
- ENABLE_REPORTDESIGN=n
- ENABLE_MEDIAWIKI=n
-else
- # extra step needed for arm, as the if matches the arm in armel..
- ifeq "$(ARCH)" "arm"
- ENABLE_JAVA=n
- ENABLE_REPORTDESIGN=n
- ENABLE_MEDIAWIKI=n
- endif
+ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCHS)))
+ ENABLE_JAVA=n
+ ENABLE_REPORTDESIGN=n
+ ENABLE_MEDIAWIKI=n
endif
ifeq "$(ENABLE_MONO)" "y"
# mono
# ppc fails (#412967), arm(el), too
-OOO_MONO_ARCHS = i386
-ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_MONO_ARCHS+= kfreebsd-i386
-endif
-ifeq "$(BUILD_AMD64)" "y"
- OOO_MONO_ARCHS += amd64
- ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_MONO_ARCHS+= kfreebsd-amd64
- endif
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_MONO_ARCHS += ia64
-endif
-#ifeq "$(BUILD_SPARC)" "y"
-# OOO_MONO_ARCHS += sparc
-#endif
-ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
+OOO_MONO_ARCHS = $(filter amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386, $(OOO_ARCHS))
+ifeq (,$(filter $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
else
@@ -620,18 +482,10 @@
endif
# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
-ifneq (,$(findstring arm,$(ARCH)))
- BUILD_BINFILTERS=n
-endif
-ifneq (,$(findstring mips,$(ARCH)))
- BUILD_BINFILTERS=n
-endif
-ifneq (,$(findstring m68k,$(ARCH)))
- BUILD_BINFILTERS=n
-endif
-OOO_BINFILTER_ARCHS:=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
-OOO_BINFILTER_ARCHS:=$(filter-out mips,$(filter-out mipsel,$(OOO_BINFILTER_ARCHS)))
-OOO_BINFILTER_ARCHS:=$(filter-out m68k,$(OOO_BINFILTER_ARCHS))
+ifneq (,$(filter arm% mips% m68k, $(ARCH)))
+ BUILD_BINFILTERS=n
+endif
+OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
@@ -652,37 +506,7 @@
# Note that this does *NOT* only affect the mozilla plugin but also
# stuff like the xmlsecurity (which uses nss). For the plugin only,
# change the OOO_NPSOPLUGIN_ARCHS
-OOO_MOZILLA_ARCHS=i386 mips mipsel powerpc powerpcspe s390
-ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_MOZILLA_ARCHS += kfreebsd-i386
-endif
-ifeq "$(BUILD_ALPHA)" "y"
- OOO_MOZILLA_ARCHS += alpha
-endif
-ifeq "$(BUILD_AMD64)" "y"
- OOO_MOZILLA_ARCHS += amd64
- ifeq "$(BUILD_KFREEBSD)" "y"
- OOO_MOZILLA_ARCHS += kfreebsd-amd64
- endif
-endif
-ifeq "$(BUILD_ARMEL)" "y"
- OOO_MOZILLA_ARCHS += armel
-endif
-ifeq "$(BUILD_HPPA)" "y"
- OOO_MOZILLA_ARCHS += hppa
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_MOZILLA_ARCHS += ia64
-endif
-ifeq "$(BUILD_PPC64)" "y"
- OOO_MOZILLA_ARCHS += ppc64
-endif
-ifeq "$(BUILD_S390X)" "y"
- OOO_MOZILLA_ARCHS += s390x
-endif
-ifeq "$(BUILD_SPARC)" "y"
- OOO_MOZILLA_ARCHS += sparc
-endif
+OOO_MOZILLA_ARCHS = $(filter-out nothing, $(OOO_ARCHS))
ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
@@ -942,7 +766,7 @@
# ifneq (,$(GCJ_JAWT_DEPENDS))
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
- ifneq (,$(filter $(ARCH), alpha amd64 i386 m68k mips mipsel powerpc powerpcspe s390 sparc))
+ ifneq (,$(filter $(ARCH), $(OOO_OPENJDK_ARCHS)))
JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
endif
ifneq (,$(filter $(ARCH), amd64 i386))
Reply to: