The following commit has been merged in the debian-experimental-3.7 branch:
commit 8500ace88ce78691e9a0a9ec45d08aa0a2c82018
Author: Rene Engelhard <r...@debian.org>
Date: Mon Oct 22 19:38:22 2012 +0200
git update; adapt for gone --enable-symbols
diff --git a/changelog b/changelog
index 9d6c805..4c2104a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121021-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121022-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -16,7 +16,7 @@ libreoffice (1:3.7.0~alpha0~git20121021-1) UNRELEASED;
urgency=low
- use gstreamer1.0
* debian/uno-libs3.symbols: update
- -- Rene Engelhard <r...@debian.org> Sun, 21 Oct 2012 22:33:32 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 22 Oct 2012 18:45:37 +0200
libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
deleted file mode 100644
index 031498a..0000000
--- a/patches/debian-debug.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/configure.ac b/configure.in
-index 3257668..afd36de 100755
---- libreoffice-3.5.0/configure.ac
-+++ libreoffice-3.5.0/configure.ac
-@@ -4078,8 +4078,13 @@ dnl whether to include debgugging information into
final build.
- dnl ===================================================================
- AC_MSG_CHECKING([whether to include debugging information])
- if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-- ENABLE_SYMBOLS="TRUE"
-- AC_MSG_RESULT([yes])
-+ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
-+ ENABLE_SYMBOLS="SMALL"
-+ AC_MSG_RESULT([yes, small ones])
-+ else
-+ ENABLE_SYMBOLS="TRUE"
-+ AC_MSG_RESULT([yes])
-+ fi
- else
- if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
- ENABLE_SYMBOLS="FALSE"
-diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
-index c73333f..9338110 100644
---- libreoffice-3.5.0/solenv/inc/unxgcc.mk
-+++ libreoffice-3.5.0/solenv/inc/unxgcc.mk
-@@ -73,7 +73,11 @@
- CFLAGS+=-fmessage-length=0 -c
-
- # flags to enable build with symbols
-+.IF "$(ENABLE_SYMBOLS)" == "SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
- CFLAGSENABLESYMBOLS=-g
-+.ENDIF
-
- # flags for the C++ Compiler
- CFLAGSCC= -pipe $(ARCH_FLAGS)
-@@ -106,7 +106,11 @@ CFLAGSSLOCUIMT=$(PICSWITCH)
- # Compiler flags for profiling
- CFLAGSPROF=
- # Compiler flags for debugging
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSDEBUG=-g1
-+.ELSE
- CFLAGSDEBUG=-g
-+.ENDIF
- CFLAGSDBGUTIL=
-
- GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
---- a/solenv/gbuild/platform/com_GCC_defs.mk-old 2012-04-23
22:19:05.806843257 +0200
-+++ b/solenv/gbuild/platform/com_GCC_defs.mk 2012-04-23 22:19:52.943076997
+0200
-@@ -131,7 +131,11 @@
- FNO_DEFAULT_INLINE=-fno-default-inline
- endif
-
-+ifeq ($(ENABLE_SYMBOLS),SMALL)
-+gb_DEBUG_CFLAGS := -g1 $(FINLINE_LIMIT0) $(FNO_INLINE)
-+else
- gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE)
-+endif
- gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
-
-
-diff --git a/unxgcc.mk-old b/unxgcc.mk
-index b85fbee..07a7012 100644
---- libreoffice-3.6.1/solenv/gbuild/platform/unxgcc.mk-old
-+++ libreoffice-3.6.1/solenv/gbuild/platform/unxgcc.mk
-@@ -192,9 +192,14 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
- gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
-
- ifeq ($(gb_SYMBOL),$(true))
-+ifeq ($(ENABLE_SYMBOLS),SMALL)
-+gb_LinkTarget_CXXFLAGS += -g1
-+gb_LinkTarget_CFLAGS += -g1
-+else
- gb_LinkTarget_CXXFLAGS += $(GGDB2)
- gb_LinkTarget_CFLAGS += $(GGDB2)
- endif
-+endif
-
- # note that `cat $(extraobjectlist)` is needed to build with older gcc
versions, e.g. 4.1.2 on SLED10
- # we want to use @$(extraobjectlist) in the long run
diff --git a/patches/debian-hardened-buildflags.diff
b/patches/debian-hardened-buildflags.diff
index 7d8065f..eb323ca 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,9 +35,9 @@ diff --git a/solenv/gbuild/LinkTarget.mk
b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
-@@ -54,6 +54,8 @@
- gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call
gb_LinkTarget__get_debugcxxflags,$(1)))
+@@ -61,6 +61,8 @@ gb_LinkTarget__get_cxxflags=$(if
$(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__g
gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call
gb_LinkTarget__get_debugcxxflags,$(1)))
+ gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call
gb_LinkTarget__get_debugldflags,$(1)))
+LDFLAGS += $(HARDEN_LDFLAGS)
+
diff --git a/patches/series b/patches/series
index 21edadf..57a2241 100644
--- a/patches/series
+++ b/patches/series
@@ -3,7 +3,6 @@ debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-binfilters-and-evo.diff
-debian-debug.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
diff --git a/rules b/rules
index b448e17..e59a1da 100755
--- a/rules
+++ b/rules
@@ -636,12 +636,13 @@ endif
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
- CFLAGS := $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
- CXXFLAGS := $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
+ CFLAGS := -g1
+ CXXFLAGS := -g1
export CFLAGS CXXFLAGS
else
- CONFIGURE_FLAGS += --enable-symbols
+ CFLAGS := -g
+ CXXFLAGS := -g
+export CFLAGS CXXFLAGS
endif
endif
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
--
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/e1tqm1x-0003ml...@vasks.debian.org
