[ucpp/el6] fix build in el6 branch

Dominik Mierzejewski rathann at fedoraproject.org
Tue Feb 25 11:39:39 UTC 2014


commit eb0c20f956636ec51e0f5239448de9716395818c
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Feb 25 12:39:55 2014 +0100

    fix build in el6 branch
    
     autoconf is too old, so autoreconf doesn't work

 ucpp.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/ucpp.spec b/ucpp.spec
index 13b9430..7fae010 100644
--- a/ucpp.spec
+++ b/ucpp.spec
@@ -5,8 +5,6 @@ Release: 3%{?dist}
 URL: https://github.com/scarabeusiv/ucpp
 Source0: http://dev.gentooexperimental.org/%7Escarabeus/ucpp-%{version}.tar.xz
 License: BSD
-# fix rpath issue
-BuildRequires: libtool
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -42,14 +40,17 @@ This package contains the development files for the library.
 iconv -f iso8859-1 -t utf8 README >README.utf8 && \
  touch -r README.utf8 README && \
  mv README.utf8 README
-# autoreconf to fix rpath issue
-autoreconf -vif
 
 %build
 %configure \
            --disable-rpath \
            --disable-silent-rules \
            --disable-static \
+           --disable-werror \
+
+# fix rpath issue
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
@@ -77,6 +78,7 @@ rm %{buildroot}%{_libdir}/libucpp.la
 %changelog
 * Sat Feb 22 2014 Dominik Mierzejewski <rpm at greysector.net> 1.3.4-3
 - add ?_isa to dependencies
+- fix build in el6 branch (autoconf is too old, so autoreconf doesn't work)
 
 * Sun Nov 03 2013 Dominik Mierzejewski <rpm at greysector.net> 1.3.4-2
 - make make verbose


More information about the scm-commits mailing list