./packages/openofficeorg/3.1/unstable r1538: more GCC_VERSION handling fixes
------------------------------------------------------------
revno: 1538
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-05-13 10:24:16 +0200
message:
more GCC_VERSION handling fixes
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-08 22:01:24 +0000
+++ b/changelog 2009-05-13 08:24:16 +0000
@@ -6,6 +6,7 @@
* debian/rules:
- add support for boost-defaults
+ - more fixes for GCC_VERSION setting
* debian/control.in, debian/rules:
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
* debian/control.in:
=== modified file 'rules'
--- a/rules 2009-05-08 22:29:24 +0000
+++ b/rules 2009-05-13 08:24:16 +0000
@@ -394,7 +394,7 @@
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
else
- CC_PREFIX=$(gcc -dumpmachine)-
+ CC_PREFIX=$(shell gcc -dumpmachine)-
endif
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
@@ -1002,8 +1002,10 @@
ifeq ($(GCC_VERSION),snapshot)
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:/usr/lib/gcc-snapshot/bin:$$PATH
BUILD_LD_LIBRARY_PATH = /usr/lib/gcc-snapshot/lib:$$LD_LIBRARY_PATH
+ BUILD_DEPS += , gcc-snapshot
else
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$(CURDIR)/debian/usr/bin:$$PATH
+ BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
Reply to: