------------------------------------------------------------
revno: 964
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-01-14 16:21:17 +0100
message:
disable scsolver for armel
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-01-08 13:36:46 +0000
+++ b/changelog 2008-01-14 15:21:17 +0000
@@ -8,7 +8,7 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11216)
+ - use trunk again (r11246)
- use new SRC680 GSIs from ftp.linux.cz
* debian/rules, debian/scripts/vars.mips{,el}, debian/scripts/vars.arm{,el}:
(re)add conditionals and vars for new mips(el)/armel and revived arm
@@ -51,7 +51,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 08 Jan 2008 14:29:27 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Jan 2008 16:20:17 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-01-08 13:36:46 +0000
+++ b/rules 2008-01-14 15:21:17 +0000
@@ -121,6 +121,7 @@
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
KDELIBS_MINVER= (>= 4:3.4.3-2)
+ENABLE_SCSOLVER=y
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.10-4)
@@ -285,6 +286,11 @@
endif
endif
+# lp-solve and libsuitesparse not available
+ifeq "$(ARCH)" "armel"
+ ENABLE_SCSOLVER=n
+endif
+
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
@@ -708,21 +714,25 @@
endif
endif
-ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
- ifeq "$(USE_SHARED_LPSOLVE)" "y"
+ifeq "$(ENABLE_SCSOLVER)" "y"
+ ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
+ ifeq "$(USE_SHARED_LPSOLVE)" "y"
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)],
lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
- else
+ else
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
- endif
+ endif
CONFIGURE_FLAGS += --with-system-lpsolve
- ifeq "$(USE_LIBSUITESPARSE)" "y"
+ ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
BUILD_DEPS += , libsuitesparse-dev [$(OOO_ARCHS)]
- else
+ else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev [$(OOO_ARCHS)]
+ endif
endif
+else
+ CONFIGURE_FLAGS += --disable-scsolver
endif
ifeq "$(USE_DBUS)" "y"
@@ -1858,11 +1868,13 @@
mv $(PKGDIR)-core/$(OODIR)/program/$$i*uno.so \
$(PKGDIR)-calc/$(OODIR)/program; \
done
+ifeq "$(ENABLE_SCSOLVER)" "y"
mv $(PKGDIR)-core/$(OODIR)/program/scsolver.uno.so \
$(PKGDIR)-calc/$(OODIR)/program
-ifneq "$(USE_SYSTEM_LPSOLVE)" "y"
+ ifneq "$(USE_SYSTEM_LPSOLVE)" "y"
mv $(PKGDIR)-core/$(OODIR)/program/liblpsolve55.so \
$(PKGDIR)-calc/$(OODIR)/program
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
