------------------------------------------------------------
revno: 1768
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-11-30 11:05:48 +0100
message:
merge hppa conditional and no-java installfix from experimental branch
added:
scripts/vars.hppa
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-11-30 09:22:03 +0000
+++ b/changelog 2009-11-30 10:05:48 +0000
@@ -4,7 +4,11 @@
- update (c17fa6c8c90e76a6c3fff6744256ee5375039c7a)
- cws-linuxhppa1.diff: backport hppa port (closes: #484116)
- * debian/rules: reenable sparc
+ * debian/rules:
+ - reenable sparc
+ - fix install on no-Java builds
+ - add BUILD_HPPA conditional, don't enable it yet
+ * debian/scripts/vars.hppa: add
-- Rene Engelhard <r...@debian.org> Mon, 16 Nov 2009 20:49:08 +0100
=== modified file 'rules'
--- a/rules 2009-11-30 09:22:03 +0000
+++ b/rules 2009-11-30 10:05:48 +0000
@@ -83,6 +83,7 @@
BUILD_PPC64=y
BUILD_S390X=y
BUILD_SPARC=y
+BUILD_HPPA=n
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -389,6 +390,9 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_ARCHS += sparc
endif
+ifeq "$(BUILD_HPPA)" "y"
+ OOO_ARCHS += hppa
+endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
@@ -482,6 +486,9 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_MOZILLA_ARCHS += sparc
endif
+ifeq "$(BUILD_HPPA)" "y"
+ OOO_MOZILLA_ARCHS += hppa
+endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
@@ -2131,6 +2138,7 @@
rmdir debian/ure/$(OOBRANDDIR)
# move URE Java stuff to /usr/share/java
mkdir -p debian/ure/usr/share/java/$(OODIRNAME)
+ifeq "$(ENABLE_JAVA)" "y"
mv debian/ure/$(OOUREDIR)/lib/JREProperties.class \
debian/ure/usr/share/java/$(OODIRNAME)
mv debian/ure/$(OOUREDIR)/share/java/* \
@@ -2141,6 +2149,7 @@
for i in
$(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/*.jar; do \
ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'`
`basename $$i`; \
done
+endif
# and the public libs to uno-libs3
mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
for i in debian/ure/$(OOUREDIR)/lib/libuno_*so.3; do \
=== added file 'scripts/vars.hppa'
--- a/scripts/vars.hppa 1970-01-01 00:00:00 +0000
+++ b/scripts/vars.hppa 2009-11-30 10:05:48 +0000
@@ -0,0 +1,2 @@
+LIBSUFFIX=lh
+PLATFORMID=linux_hppa
