[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-2-8-g202e245
The following commit has been merged in the debian-experimental-4.0 branch:
commit 3b26be8c9226832141c7fdcc337c395c8ac09d80
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 10 23:12:01 2013 +0200
Remove arm* hack for internal clucene as it seems to work in the meanwhile
diff --git a/changelog b/changelog
index f43e2bb..62a47c7 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:4.0.2-1) UNRELEASED; urgency=low
- actually use ${pyuno-depends}...
* debian/rules:
- enable liblangtag on arm*, too now that it's available there
+ - Remove arm* hack for internal clucene as it seems to work in the
+ meanwhile
-- Rene Engelhard <rene@debian.org> Tue, 02 Apr 2013 12:39:08 +0200
diff --git a/rules b/rules
index 0f83402..5ef0902 100755
--- a/rules
+++ b/rules
@@ -349,15 +349,7 @@ SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
SYSTEM_STUFF += clucene
-ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
- ENABLE_HELP=y
-else
- ifeq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
- ENABLE_HELP=n
- else
- ENABLE_HELP=y
- endif
-endif
+ENABLE_HELP=y
SYSTEM_STUFF += lcms2
SYSTEM_STUFF += openldap
PACKAGE_UNOWINREG_DLL=y
@@ -441,11 +433,7 @@ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_UNOWINREG_DLL_ARCHS)
PACKAGE_UNOWINREG_DLL=n
endif
-ifeq (,$(filter clucene, $(SYSTEM_STUFF)))
- OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel armhf,$(OOO_ARCHS))
-else
- OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
-endif
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
@@ -977,12 +965,6 @@ endif
ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
BUILD_DEPS += , libclucene-dev (>= 2.3.3.4-2)
-else
- ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
- # FIXME. If you really want this, comment this out then help stuff will
- # be disabled on arm*
- $(error internal clucene makes HelpIndexer segfault on ARM!)
- endif
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
--
LibreOffice packaging repository
Reply to: