The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c411ff845cc9cae4f29c1afaaa9c15a10b80216e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Jun 24 05:34:35 2012 +0200
replace (nonworking) old gcc versioning with simple working one
diff --git a/rules b/rules
index 5919e9a..703e109 100755
--- a/rules
+++ b/rules
@@ -518,7 +518,10 @@ CC_PREFIX:=$(shell gcc -dumpmachine)-
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
- BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ CONFIGURE_FLAGS+= \
+ CC=$(CC_PREFIX)gcc-$(GCC_VERSION) \
+ CXX=$(CC_PREFIX)g++-$(GCC_VERSION)
endif
endif
@@ -1565,29 +1568,6 @@ config.status:
mkdir -p $(STAMP_DIR)
-ifneq ($(GCC_VERSION),)
- ifneq ($(GCC_VERSION),snapshot)
- # create links for gcc and g++ (and gij and gcj), ooo-build does not
- # honour overriding CC and CXX and we need to use gcc/g++ 4.0 or /
- # ant.mk wants gcj at the moment...
- 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
- ifneq "$(CC_PREFIX)" ""
- mkdir -p $(CURDIR)/debian/usr/bin
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcc
$(CURDIR)/debian/usr/bin/gcc
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)g++
$(CURDIR)/debian/usr/bin/g++
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcj
$(CURDIR)/debian/usr/bin/gcj
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gij
$(CURDIR)/debian/usr/bin/gij
- endif
- endif
-endif
-
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyx-0005ti...@vasks.debian.org
