------------------------------------------------------------
revno: 1469
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-05-04 17:05:30 +0200
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-04 13:25:21 +0000
+++ b/changelog 2009-05-04 15:05:30 +0000
@@ -3,6 +3,8 @@
* debian/rules:
- move python version setting before the python conditionals deciding
whether to apply Python26 patchset or not, thanks Chris Cheney
+ - 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-04-29 23:04:11 +0000
+++ b/rules 2009-05-04 15:05:30 +0000
@@ -364,7 +364,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
@@ -1447,6 +1450,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
