./packages/openofficeorg/2.4/experimental r975: + * debian/rules, debian/scripts/vars.ia64: first preparations for the
------------------------------------------------------------
revno: 975
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-01-20 23:46:42 +0100
message:
+ * debian/rules, debian/scripts/vars.ia64: first preparations for the
+ (upcoming) ia64 port
added:
scripts/vars.ia64
modified:
changelog
rules
=== added file 'scripts/vars.ia64'
--- a/scripts/vars.ia64 1970-01-01 00:00:00 +0000
+++ b/scripts/vars.ia64 2008-01-20 22:46:42 +0000
@@ -0,0 +1,1 @@
+LIBSUFFIX=la
=== modified file 'changelog'
--- a/changelog 2008-01-18 17:47:36 +0000
+++ b/changelog 2008-01-20 22:46:42 +0000
@@ -8,11 +8,13 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11324)
+ - use trunk again (r11331)
- use new OOH680 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
support; enable
+ * debian/rules, debian/scripts/vars.ia64: first preparations for the
+ (upcoming) ia64 port
* debian/rules:
- fix configure flags for "no mozilla" case, we need to specify
--without-system-mozilla explicitely
@@ -62,7 +64,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <rene@debian.org> Fri, 18 Jan 2008 18:34:17 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 20 Jan 2008 23:39:16 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-01-18 17:47:36 +0000
+++ b/rules 2008-01-20 22:46:42 +0000
@@ -244,6 +244,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_OGLTRANS_ARCHS+= ppc64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_OGLTRANS_ARCHS+= ia64
+endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OGLTRANS=n
endif
@@ -255,6 +258,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_ARCHS += ppc64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_ARCHS += ia64
+endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel armel
ifeq "$(BUILD_AMD64)" "y"
@@ -263,6 +269,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_JAVA_ARCHS+= ppc64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_JAVA_ARCHS+= ia64
+endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
endif
@@ -272,6 +281,9 @@
ifeq "$(BUILD_AMD64)" "y"
OOO_MONO_ARCHS += amd64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_MONO_ARCHS += ia64
+endif
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
@@ -287,6 +299,11 @@
PACKAGE_NPSOPLUGIN=n
endif
endif
+ifeq "$(BUILD_IA64)" "y"
+ ifeq "$(ARCH)" "ia64"
+ PACKAGE_NPSOPLUGIN=n
+ endif
+endif
# lp-solve and libsuitesparse not available
ifeq "$(ARCH)" "armel"
@@ -299,6 +316,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_SCSOLVER_ARCHS += ppc64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_SCSOLVER_ARCHS += ia64
+endif
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
@@ -312,6 +332,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_MOZILLA_ARCHS += ppc64
endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_MOZILLA_ARCHS += ia64
+endif
# We only build the main openoffice.org packages on those architectures where it works
# all other architectures build libmythes-dev
@@ -329,6 +352,11 @@
BUILD_ONLY_LIBMYTHES=y
endif
endif
+ ifeq "$(ARCH)" "ia64"
+ ifneq "$(BUILD_IA64)" "y"
+ BUILD_ONLY_LIBMYTHES=y
+ endif
+ endif
endif
endif
Reply to: