From 80bac909af437c2f29747c611a1aef3f686177606462abe66b5a368237ded1e9 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 23 Apr 2012 07:04:49 +0000 Subject: [PATCH] Accepting request 112480 from home:k0da:ppc - remove rpath - remove rpath OBS-URL: https://build.opensuse.org/request/show/112480 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=28 --- cyrus-sasl-no_rpath.patch | 21 +++++++++++++++++++++ cyrus-sasl-saslauthd.changes | 5 +++++ cyrus-sasl-saslauthd.spec | 2 ++ cyrus-sasl.changes | 5 +++++ cyrus-sasl.spec | 2 ++ 5 files changed, 35 insertions(+) create mode 100644 cyrus-sasl-no_rpath.patch diff --git a/cyrus-sasl-no_rpath.patch b/cyrus-sasl-no_rpath.patch new file mode 100644 index 0000000..46c2b6e --- /dev/null +++ b/cyrus-sasl-no_rpath.patch @@ -0,0 +1,21 @@ +Index: cyrus-sasl-2.1.25/cmulocal/cyrus.m4 +=================================================================== +--- cyrus-sasl-2.1.25.orig/cmulocal/cyrus.m4 ++++ cyrus-sasl-2.1.25/cmulocal/cyrus.m4 +@@ -32,14 +32,5 @@ AC_DEFUN([CMU_ADD_LIBPATH_TO], [ + dnl runpath initialization + AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ + # CMU GUESS RUNPATH SWITCH +- AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [ +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" +- AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [ +-# LDFLAGS="-Wl,-rpath,/usr/lib" +- AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"], +- [andrew_cv_runpath_switch="none"]) +- ]) +- LDFLAGS="${SAVE_LDFLAGS}" +- ])]) ++ andrew_runpath_switch="none" ++ ]) diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 7d06038..b521c39 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 14:13:51 UTC 2012 - dvaleev@suse.com + +- remove rpath + ------------------------------------------------------------------- Wed Jan 18 13:06:35 UTC 2012 - aj@suse.de diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 61f32f5..068c4ca 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -35,6 +35,7 @@ Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif Patch4: gssapi-null-deref.dif +Patch5: cyrus-sasl-no_rpath.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +69,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build find . -name \*.cvsignore -print0 | xargs -0 rm -vf diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index bf23bbf..f9896c3 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 14:13:36 UTC 2012 - dvaleev@suse.com + +- remove rpath + ------------------------------------------------------------------- Wed Jan 18 13:06:00 UTC 2012 - aj@suse.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 15faa53..042e8f1 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -40,6 +40,7 @@ Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif Patch4: gssapi-null-deref.dif +Patch5: cyrus-sasl-no_rpath.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -161,6 +162,7 @@ fi %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build find . -name \*.cvsignore -print0 | xargs -0 rm -fv