./packages/openofficeorg/3.1/experimental r1520: - fix GCC_VERSION handling to work again with OOo build calling
------------------------------------------------------------
revno: 1520
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-05-04 17:00:11 +0200
message:
- fix GCC_VERSION handling to work again with OOo build calling
e.g. i486-linux-gnu-gcc
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-04 13:28:39 +0000
+++ b/changelog 2009-05-04 15:00:11 +0000
@@ -8,6 +8,8 @@
- move python version setting before the python conditionals deciding
thanks Chris Cheney)
- remove arch specifier from openjdk build-dep
+ - fix GCC_VERSION handling to work again with OOo build calling
+ e.g. i486-linux-gnu-gcc
* debian/watch: move from ftp.stardiv.de (not master anymore) to
ftp.gwdg.de
=== modified file 'rules'
--- a/rules 2009-05-04 07:50:47 +0000
+++ b/rules 2009-05-04 15:00:11 +0000
@@ -387,7 +387,10 @@
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
+else
+ CC_PREFIX=$(gcc -dumpmachine)-
endif
+
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390]
endif
@@ -1464,6 +1467,8 @@
mkdir -p $(CURDIR)/debian/usr/bin
ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc
ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++
+ ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)gcc
+ ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)g++
#ln -sf /usr/bin/$(CC_PREFIX)gcj-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcj
#ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij
else
Reply to: