[nss_ldap/f14/master] - can't static link any more; symbol collisions are go

Nalin Dahyabhai nalin at fedoraproject.org
Fri Aug 20 19:09:38 UTC 2010


commit 862d1eee1ae92d087969aac370457da0dc620ae9
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Aug 19 19:26:29 2010 -0400

    - can't static link any more; symbol collisions are go

 nss_ldap.spec |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/nss_ldap.spec b/nss_ldap.spec
index 9d91f9a..2588a56 100644
--- a/nss_ldap.spec
+++ b/nss_ldap.spec
@@ -25,7 +25,6 @@ Patch26: nss_ldap-265-erange.patch
 Patch27: nss_ldap-265-initgroups-minimum_uid.patch
 
 BuildRequires: autoconf, automake, libtool
-BuildRequires: openssl-devel, openssl-static
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openldap-devel >= 2.0.27
 BuildRequires: openldap-evolution-devel
@@ -61,16 +60,13 @@ autoreconf -f -i
 cp %{_datadir}/libtool/config/config.{sub,guess} .
 
 %build
-# Build with static copies of as may of the dependent libraries as we can, so
-# that we can bind references symbols the module uses to the copy bundled into
-# the module, and hide them from any calling applications.
 %configure \
 	--with-ldap-lib=openldap \
 	--enable-rfc2307bis \
 	--with-ldap-conf-file=%{_sysconfdir}/%{name}.conf \
 	--with-ldap-secret-file=%{_sysconfdir}/%{name}.secret \
 	--enable-configurable-krb5-ccname-gssapi
-env PATH=`pwd`:"$PATH" make %{?_smp_mflags} LIBS="-L%{_libdir}/evolution-openldap/%{_lib} -Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
+env PATH=`pwd`:"$PATH" make
 
 # Check that the module is actually loadable.
 sh %{SOURCE7} ./nss_ldap.so
@@ -152,6 +148,7 @@ fi
 * Thu Aug 19 2010 Nalin Dahyabhai <nalin at redhat.com> 265-6
 - take another stab at implementing a working nss_initgroups_minimum_uid
   setting, and default it to 500
+- can't static link any more, potential symbol collisions are go
 
 * Thu Jul  8 2010 Nalin Dahyabhai <nalin at redhat.com> 265-5
 - add proposed patch for upstream #421: sometimes errno gets reset before we


More information about the scm-commits mailing list