Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv9379
Modified Files:
Tag: OPENOFFICE_ORG680
changelog rules
Log Message:
- create links to /usr/bin/g{cc,++}-4.0 in debian/usr/bin and
change path to use them, ooo-build doesn't honor CC and CXX [RE]
* debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat
1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it
in Debian (in NEW...).
Needed to overcome shortcomings in OOo's build which sometimes uses javac
and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
Matthias Klose [RE]
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.14
retrieving revision 1.338.2.25.2.15
diff -u -d -r1.338.2.25.2.14 -r1.338.2.25.2.15
--- changelog 13 Mar 2005 22:54:11 -0000 1.338.2.25.2.14
+++ changelog 14 Mar 2005 18:01:19 -0000 1.338.2.25.2.15
@@ -15,8 +15,16 @@
- install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program
in a try to be installable in unstable [RE]
- move gnome-open-url.bin into -gnome [RE]
+ - create links to /usr/bin/g{cc,++}-4.0 in debian/usr/bin and
+ change path to use them, ooo-build doesn't honor CC and CXX [RE]
+ * debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat
+ 1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it
+ in Debian (in NEW...).
+ Needed to overcome shortcomings in OOo's build which sometimes uses javac
+ and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
+ Matthias Klose [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 13 Mar 2005 23:51:45 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Mar 2005 18:44:56 +0100
openoffice.org2 (1.9.76-0pre) experimental; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.17
retrieving revision 1.214.2.14.2.18
diff -u -d -r1.214.2.14.2.17 -r1.214.2.14.2.18
--- rules 13 Mar 2005 22:54:11 -0000 1.214.2.14.2.17
+++ rules 14 Mar 2005 18:01:20 -0000 1.214.2.14.2.18
@@ -75,6 +75,15 @@
PYTHON_DEPENDS=python (>= $(PYMAJOR).$(PYMINOR)), python (<<
$(PYMAJOR).$(PYMINORPLUS1))
PYTHON_SITE:=debian/python-uno/usr/lib/python$(PYMAJOR).$(PYMINOR)/site-packages
+CURDIR ?= $(shell pwd)
+
+GCC_VERSION = 4.0
+ifeq ($(GCC_VERSION),)
+ BUILD_PATH =
$(CURDIR)/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin:$$PATH
+else
+ BUILD_PATH =
$(CURDIR)/debian/usr/lib/jvm/java-java-1.4.2-gcj-4.0-1.4.2.0/bin:$(CURDIR)/debian/usr/bin:$$PATH
+endif
+
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
@@ -217,16 +226,24 @@
fi ;\
done
+ # create links for gcc nd g++, ooo-build does not hoour overriding
+ # CC and CC and we need to use gcc/g++ 4.0
+ifneq ($(GCC_VERSION),)
+ mkdir -p $(CURDIR)/debian/usr/bin
+ ln -sf /usr/bin/gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc
+ ln -sf /usr/bin/g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++
+endif
+
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
- cd ooo-build ; ../ooo-build/configure $(CONFIGURE_FLAGS)
+ cd ooo-build ; PATH=$(BUILD_PATH) ../ooo-build/configure
$(CONFIGURE_FLAGS)
touch $@
build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: ooo-build/config.status
dh_testdir
- cd ooo-build ; $(MAKE)
+ cd ooo-build ; PATH=$(BUILD_PATH) $(MAKE)
touch $@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
