diff --git a/cyrus-sasl-2.1.18-no_rpath.patch b/cyrus-sasl-2.1.18-no_rpath.patch new file mode 100644 index 0000000..6f84554 --- /dev/null +++ b/cyrus-sasl-2.1.18-no_rpath.patch @@ -0,0 +1,19 @@ +--- cyrus-sasl-2.1.18/cmulocal/cyrus.m4.no_rpath 2004-05-13 14:32:14.341038898 +0200 ++++ cyrus-sasl-2.1.18/cmulocal/cyrus.m4 2004-05-13 14:34:18.471968788 +0200 +@@ -32,14 +32,5 @@ + dnl runpath initialization + AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ + # CMU GUESS RUNPATH SWITCH +- AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [ +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [ +- LDFLAGS="-Wl,-rpath,/usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"], +- [andrew_runpath_switch="none"]) +- ]) +- LDFLAGS="${SAVE_LDFLAGS}" +- ])]) ++ andrew_runpath_switch="none" ++ ]) diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 8a0add0..83903bf 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -10,7 +10,7 @@ Summary: The Cyrus SASL library. Name: cyrus-sasl Version: 2.1.18 -Release: 2 +Release: 3 License: Freely Distributable Group: System Environment/Libraries Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz @@ -38,6 +38,7 @@ Patch6: cyrus-sasl-2.1.10-des.patch Patch7: cyrus-sasl-2.1.17-gssapi-dynamic.patch Patch9: cyrus-sasl-2.1.17-saslauthd1.patch Patch10: cyrus-sasl-2.1.18-db_bundle.patch +Patch11: cyrus-sasl-2.1.18-no_rpath.patch Buildroot: %{_tmppath}/%{name}-root %if %{includev1} BuildPrereq: gdbm-devel @@ -121,6 +122,7 @@ done %patch7 -p1 -b .gssapi-dynamic #%patch9 -p1 -b .saslauthd1 %patch10 -p1 -b .db_bundle +%patch11 -p1 -b .no_rpath # FIXME - this is just weird rm config/ltconfig config/libtool.m4 libtoolize -f -c @@ -457,6 +459,9 @@ fi # TODO: enable sql if the time comes when the soname doesn't change too often # %changelog +* Thu May 13 2004 Thomas Woerner 2.1.18-3 +- removed rpath + * Tue Mar 16 2004 Nalin Dahyabhai 2.1.18-2 - turn on building of libsasl v1 again