[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_rc1-1-5-gea81963
The following commit has been merged in the debian-experimental-4.1 branch:
commit 5b7962a1bbca4ef1fb3c81d4591f8e0bee0e6dd6
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 1 22:35:02 2013 +0200
revert gcc 4.6 hack; armel built fine with g++-4.8, including checks...
diff --git a/changelog b/changelog
index 0ba5b16..dba642c 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,10 @@ libreoffice (1:4.1.0~rc1-2) UNRELEASED; urgency=low
#undef __sparcv8plus, __sparcv9 and __sparc_v9__ for interlck_sparc.o as
we otherwise miss osl_InterlockedCountSetV9...
+ * debian/rules:
+ - revert gcc 4.6 hack; armel built fine with g++-4.8, including checks,
+ so let's try with it everywhere.
+
-- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +0200
libreoffice (1:4.1.0~rc1-1) experimental; urgency=low
diff --git a/control b/control
index f15ace1..93ca776 100644
--- a/control
+++ b/control
@@ -16,9 +16,7 @@ Build-Depends: ant (>= 1.7.0),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
- g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@ -4449,9 +4447,7 @@ Depends: ant (>= 1.7.0),
fastjar,
flex | flex-old,
fontforge,
- g++-4.6,
g++-mingw-w64-i686,
- gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
diff --git a/rules b/rules
index f75f6f6..54e4e6a 100755
--- a/rules
+++ b/rules
@@ -551,14 +551,14 @@ CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
- BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
-ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
- ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
- ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
- GCC_VERSION := 4.6
- endif
- endif
-endif
+# BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+#ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+# ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+# ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+# GCC_VERSION := 4.6
+# endif
+# endif
+#endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
--
LibreOffice packaging repository
Reply to: