packages: libldb/libldb.spec, libldb/version-script.patch (REMOVED) - force...

[glen]

Author: glen                         Date: Thu Oct 20 06:51:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- force ld.bfd via -fuse-ld=bfd (option since gcc-6:4.6.1-5)

---- Files affected:
packages/libldb:
   libldb.spec (1.3 -> 1.4) , version-script.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libldb/libldb.spec
diff -u packages/libldb/libldb.spec:1.3 packages/libldb/libldb.spec:1.4
--- packages/libldb/libldb.spec:1.3	Thu Oct 13 09:44:26 2011
+++ packages/libldb/libldb.spec	Thu Oct 20 08:51:19 2011
@@ -1,19 +1,18 @@
 # $Revision$, $Date$
 # TODO
-# - really fix the version script error (version-script.patch)
+# - ld.bfd enforced because gold does not understand '!' in version script (binutils-3:2.21.53.0.1-1)
 %define		talloc_version	2.0.5
 %define		tdb_version		1.2.9
 %define		tevent_version	0.9.12
 Summary:	A schema-less, ldap like, API and database
 Name:		libldb
 Version:	1.1.0
-Release:	1
+Release:	2
 License:	LGPL v3+
 Group:		Development/Libraries
 URL:		http://ldb.samba.org/
 Source0:	http://samba.org/ftp/ldb/ldb-%{version}.tar.gz
 # Source0-md5:	61145ad9cfe017ce4fca5cbc77b9552b
-Patch0:		version-script.patch
 BuildRequires:	autoconf
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libtalloc-devel >= %{talloc_version}
@@ -74,18 +73,11 @@
 
 %prep
 %setup -q -n ldb-%{version}
-%patch0 -p1
 
 %build
-# use ld.bfd
-install -d $(pwd)/ld-bin
-ln -s %{_bindir}/ld.bfd $(pwd)/ld-bin/ld
-
-# note: configure in fact is waf call
-PATH=$(pwd)/ld-bin:$PATH \
-COMPILER_PATH=$(pwd)/ld-bin \
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
+LDFLAGS="%{rpmldflags} -fuse-ld=bfd" \
 PYTHONDIR=%{py_sitedir} \
 ./configure \
 	--prefix=%{_prefix} \
@@ -109,7 +101,7 @@
 
 # Shared libraries need to be marked executable for
 # rpmbuild to strip them and include them in debuginfo
-find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
+find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -173,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/10/20 06:51:19  glen
+- force ld.bfd via -fuse-ld=bfd (option since gcc-6:4.6.1-5)
+
 Revision 1.3  2011/10/13 07:44:26  glen
 - try to force ld.bfd in PATH/COMPILER_PATH. still gcc internally uses /usr/bin/ld :(
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libldb/libldb.spec?r1=1.3&r2=1.4&f=u