OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2003 16:37:01
Branch: HEAD Handle: 2003031115370000
Modified files:
openpkg-src/sasl sasl.spec
Log:
make plugins shared
Summary:
Revision Changes Path
1.56 +25 -2 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 sasl.spec
--- openpkg-src/sasl/sasl.spec 11 Mar 2003 11:22:32 -0000 1.55
+++ openpkg-src/sasl/sasl.spec 11 Mar 2003 15:37:00 -0000 1.56
@@ -114,7 +114,6 @@
LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
- --exec-prefix=%{l_prefix} \
--with-plugindir=%{l_prefix}/lib/sasl \
--with-saslauthd=%{l_prefix}/var/sasl/saslauthd \
--with-dbpath=%{l_prefix}/var/sasl/sasldb \
@@ -141,8 +140,9 @@
%else
--without-mysql \
%endif
- --disable-shared \
+ --enable-shared \
--enable-static \
+ --enable-staticdlopen \
--disable-java \
--disable-sample \
--disable-krb4 \
@@ -150,6 +150,20 @@
--disable-otp \
--without-des \
--without-opie
+
+ # trust me, libtool, I know what I am doing
+ %{l_shtool} subst \
+ -e 's;^\(deplibs_check_method=\).*;\1"pass_all";' \
+ libtool
+ # do not reference static plugins
+ %{l_shtool} subst \
+ -e 's;^\(#ifndef PIC\);#define PIC\n\1;' \
+ lib/dlopen.c
+ # do not pull static plugins into static library
+ %{l_shtool} subst \
+ -e '/^SASL_STATIC_OBJS/s;\.\./plugins/[^ ]* *;;g' \
+ lib/Makefile
+
%{l_make} %{l_mflags}
cd saslauthd
%{l_make} %{l_mflags} testsaslauthd
@@ -157,6 +171,15 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # remove libtool cruft
+ rm -f \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/*.la \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/*.so \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/*.so.* \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2/*.la \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2/*.a
+
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8
%{l_shtool} install -c -m 644 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]