jwrdegoede pushed to ClanLib (master). "Fix building with _hardened_build 1 (rhbz#1207404)"

[notifications at fedoraproject.org]

>From 716d12513044ce39b3c7ea2a395e10ee4c92ad13 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Thu, 2 Apr 2015 15:30:40 +0200
Subject: Fix building with _hardened_build 1 (rhbz#1207404)


diff --git a/ClanLib-2.3.7-no-ldflags-for-conftest.patch b/ClanLib-2.3.7-no-ldflags-for-conftest.patch
new file mode 100644
index 0000000..c22e581
--- /dev/null
+++ b/ClanLib-2.3.7-no-ldflags-for-conftest.patch
@@ -0,0 +1,19 @@
+diff -up ClanLib-2.3.7/acinclude.m4~ ClanLib-2.3.7/acinclude.m4
+--- ClanLib-2.3.7/acinclude.m4~	2011-11-24 11:57:30.000000000 +0100
++++ ClanLib-2.3.7/acinclude.m4	2015-04-02 15:22:52.060631122 +0200
+@@ -5,6 +5,7 @@ dnl CLANLIB_CHECK_LIB(lib, testprog, mod
+ define([CLANLIB_CHECK_LIB],[if test "$enable_$3" != "no"; then
+     OLDLIBS="$LIBS"; LIBS="$5"; AC_MSG_CHECKING(for $1)
+     OLD_CXXFLAGS="$CXXFLAGS"; CXXFLAGS="$6";
++    OLD_LDFLAGS="$LDFLAGS"; LDFLAGS=;
+     AC_RUN_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT=yes], [CL_RESULT=no], [AC_LINK_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT="yes, linked"],[CL_RESULT=no])])
+     AC_MSG_RESULT([$CL_RESULT])
+     if test "$CL_RESULT" = "no"; then
+@@ -14,6 +15,7 @@ define([CLANLIB_CHECK_LIB],[if test "$en
+         extra_LIBS_$3=" $extra_LIBS_$3 $LIBS "
+     fi
+     CXXFLAGS="$OLD_CXXFLAGS"
++    LDFLAGS="$OLD_LDFLAGS"
+     LIBS="$OLDLIBS"
+ fi])
+ 
diff --git a/ClanLib.spec b/ClanLib.spec
index a55c41c..02e6645 100644
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,7 +1,7 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        2.3.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
@@ -12,11 +12,12 @@ Source1:        ClanLib-%{version}-generated-docs.zip
 Patch1:         ClanLib-2.3.4-gcc47.patch
 Patch2:         ClanLib-2.3.4-non-x86.patch
 Patch3:         ClanLib-2.3.7-no-wm_type-in-fs.patch
+Patch4:         ClanLib-2.3.7-no-ldflags-for-conftest.patch
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel mikmod-devel alsa-lib-devel
 BuildRequires:  libpng-devel libjpeg-devel fontconfig-devel pcre-devel
-BuildRequires:  libXrender-devel sqlite-devel
+BuildRequires:  libXrender-devel sqlite-devel libtool
 Provides:       clanlib = %{version}-%{release}
 
 %description
@@ -41,6 +42,8 @@ ClanLib development headers and libraries
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+./autogen.sh
 mv reference_doxygen html
 
 
@@ -87,6 +90,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Thu Apr  2 2015 Hans de Goede <hdegoede at redhat.com> - 2.3.7-6
+- Fix building with _hardened_build 1 (rhbz#1207404)
+
 * Mon Mar 30 2015 Xavier Bachelot <xavier at bachelot.org> - 2.3.7-5
 - Don't rely on autodetection to select which modules to build.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ClanLib.git/commit/?h=master&id=716d12513044ce39b3c7ea2a395e10ee4c92ad13