Accepting request 114989 from network

- remove rpath 

- remove rpath (forwarded request 112480 from k0da)

OBS-URL: https://build.opensuse.org/request/show/114989
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cyrus-sasl?expand=0&rev=33
This commit is contained in:
Stephan Kulow 2012-04-23 14:09:40 +00:00 committed by Git OBS Bridge
commit a6f024d906
5 changed files with 35 additions and 0 deletions

21
cyrus-sasl-no_rpath.patch Normal file
View File

@ -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"
+ ])

View File

@ -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 Wed Jan 18 13:06:35 UTC 2012 - aj@suse.de

View File

@ -35,6 +35,7 @@ Patch1: shared_link_on_ppc.patch
Patch2: cyrus-sasl-gcc4.patch Patch2: cyrus-sasl-gcc4.patch
Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif
Patch4: gssapi-null-deref.dif Patch4: gssapi-null-deref.dif
Patch5: cyrus-sasl-no_rpath.patch
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -68,6 +69,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL
%patch2 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
find . -name \*.cvsignore -print0 | xargs -0 rm -vf find . -name \*.cvsignore -print0 | xargs -0 rm -vf

View File

@ -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 Wed Jan 18 13:06:00 UTC 2012 - aj@suse.de

View File

@ -40,6 +40,7 @@ Patch1: shared_link_on_ppc.patch
Patch2: cyrus-sasl-gcc4.patch Patch2: cyrus-sasl-gcc4.patch
Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif
Patch4: gssapi-null-deref.dif Patch4: gssapi-null-deref.dif
Patch5: cyrus-sasl-no_rpath.patch
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -161,6 +162,7 @@ fi
%patch2 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
find . -name \*.cvsignore -print0 | xargs -0 rm -fv find . -name \*.cvsignore -print0 | xargs -0 rm -fv