From b8387f32719a2e9b6f37fa627dafd8a43ee3586cfc56d9ccdf884f6a04e59323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 2 Mar 2012 05:13:31 +0000
Subject: [PATCH] Accepting request 107744 from
 home:elvigia:branches:devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/107744
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml?expand=0&rev=16
---
 Makefile.am     |  6 ++++--
 configure.ac    |  6 ++++--
 tinyxml.changes | 13 +++++++++++++
 tinyxml.spec    |  1 -
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index eabdaa3..280fa18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,10 @@ SUBDIRS         = docs
 ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES       = libtinyxml.la
+libtinyxml_la_CXXFLAGS = -fvisibility-inlines-hidden
+libtinyxml_la_CPPFLAGS = -include $(top_srcdir)/config.h
 libtinyxml_la_SOURCES = tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp
-libtinyxml_la_LDFLAGS = -version-info 0:0:0
+libtinyxml_la_LDFLAGS = -Wl,-Bsymbolic-functions -Wl,-z,relro,-z,now -no-undefined -version-info 0:0:0
 include_HEADERS       = tinyxml.h tinystr.h
 
 check_PROGRAMS  = xmltest
@@ -35,7 +37,7 @@ if PROFILE
 endif
 
 if TINYXML_USE_STL
-    libtinyxml_la_CPPFLAGS = -DTIXML_USE_STL=1
+    libtinyxml_la_CPPFLAGS += -DTIXML_USE_STL=1
 endif
 
 EXTRA_DIST = changes.txt readme.txt tinyxml_lib.dsp tinyxmlSTL.dsp tinyXmlTestSTL.vcproj \
diff --git a/configure.ac b/configure.ac
index e89bb77..6317316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,10 @@ AM_INIT_AUTOMAKE([foreign])
 
 # Checks for programs.
 AC_PROG_CXX
-AC_PROG_CC
-LT_INIT([disable-static])
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+LT_INIT([disable-static pic-only])
 
 AC_LANG(C++)
 
diff --git a/tinyxml.changes b/tinyxml.changes
index bf9cc64..ab0ba65 100644
--- a/tinyxml.changes
+++ b/tinyxml.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Mar  2 01:25:08 UTC 2012 - crrodriguez@opensuse.org
+
+- Ensure the generated config.h file gets included 
+  in all C++ files during build...
+
+-------------------------------------------------------------------
+Fri Mar  2 01:18:24 UTC 2012 - crrodriguez@opensuse.org
+
+- Make tinyxml slightly tinier by building it with 
+  -fvisibility-inlines-hidden.
+- Also build with full RELRO and bsymbolic-functions
+
 -------------------------------------------------------------------
 Mon Feb 13 10:56:54 UTC 2012 - coolo@suse.com
 
diff --git a/tinyxml.spec b/tinyxml.spec
index efd2531..d786ff4 100644
--- a/tinyxml.spec
+++ b/tinyxml.spec
@@ -93,7 +93,6 @@ rm -f tinyxml.h
 
 %build
 autoreconf -fi
-export CXXFLAGS="%{optflags}"
 %configure
 make %{?_smp_mflags}