From 71e47a294b167d5c695841717c7b4358a4886fdf9f2e2ec3f2f2c5684102cf24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 30 Apr 2011 19:06:06 +0000 Subject: [PATCH] Accepting request 68918 from home:elvigia:branches:devel:libraries:c_c++ - Fix build with gcc 4.6 OBS-URL: https://build.opensuse.org/request/show/68918 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zziplib?expand=0&rev=7 --- ready | 0 zziplib-0.13.58-wronglinking.patch | 22 ++++++++++++++++++++++ zziplib.changes | 5 +++++ zziplib.spec | 3 ++- 4 files changed, 29 insertions(+), 1 deletion(-) delete mode 100644 ready create mode 100644 zziplib-0.13.58-wronglinking.patch diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/zziplib-0.13.58-wronglinking.patch b/zziplib-0.13.58-wronglinking.patch new file mode 100644 index 0000000..31640b6 --- /dev/null +++ b/zziplib-0.13.58-wronglinking.patch @@ -0,0 +1,22 @@ +--- configure.ac.orig ++++ configure.ac +@@ -288,7 +288,7 @@ case "$host_os" in + + if test ".$can_build_shared" = .no + then ZZIPLIB_LDFLAGS="" +- else ZZIPLIB_LDFLAGS="--export-dynamic" ++ else ZZIPLIB_LDFLAGS="-Wl,--export-dynamic" + fi + RESOLVES=' # ' + ;; +--- zzip/Makefile.am.orig ++++ zzip/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.5 foreign + AUTOTOOL_VERSION=autoconf-2.52 automake-1.5 libtool-1.4.2 + DEFAULT_INCLUDES = # nothing - no default of -I. -I$(srcdir) + DEFS = @DEFS@ -I$(top_builddir) -I$(top_srcdir) # also for automake 1.4 +- ++AM_CFLAGS = -fno-strict-aliasing + lib_LTLIBRARIES = libzzip.la libzzipmmapped.la libzzipfseeko.la + zzipdir = ${includedir}/zzip + zzip_HEADERS = $(libzzip_la_headers) \ diff --git a/zziplib.changes b/zziplib.changes index 7cbf396..d8e2223 100644 --- a/zziplib.changes +++ b/zziplib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 30 15:22:39 UTC 2011 - crrodriguez@opensuse.org + +- Fix build with gcc 4.6 + ------------------------------------------------------------------- Mon Feb 15 16:43:03 CET 2010 - dimstar@opensuse.org diff --git a/zziplib.spec b/zziplib.spec index 3d5b81e..4f1e875 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -28,6 +28,7 @@ AutoReqProv: on Url: http://zziplib.sourceforge.net Source0: http://prdownloads.sourceforge.net/zziplib/%{name}-%{version}.tar.bz2 Patch: zziplib-0.13.49.patch +Patch1: zziplib-0.13.58-wronglinking.patch BuildRequires: pkgconfig python zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,7 +49,7 @@ ZZipLib. %prep %setup -q %patch - +%patch1 %build autoreconf -fiv %configure --enable-largefile --disable-static --with-pic