From b23f77c3774df294f73e34fdb833a166ac470d55b8fb94c63cda7b98b333f2d1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 4 Jun 2012 10:15:07 +0000 Subject: [PATCH] - ld.so is basically empty nowadays, so put together a config file just to ignore rpaths OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=64 --- ignore-ldso.conf.patch | 9 +++++++++ post-build-checks.changes | 6 ++++++ post-build-checks.spec | 11 +++++++++++ 3 files changed, 26 insertions(+) create mode 100644 ignore-ldso.conf.patch diff --git a/ignore-ldso.conf.patch b/ignore-ldso.conf.patch new file mode 100644 index 0000000..d4ea104 --- /dev/null +++ b/ignore-ldso.conf.patch @@ -0,0 +1,9 @@ +Index: post-build-checks-1.0/suse-buildsystem.sh +=================================================================== +--- post-build-checks-1.0.orig/suse-buildsystem.sh 2011-10-20 11:57:54.000000000 +0200 ++++ post-build-checks-1.0/suse-buildsystem.sh 2012-06-04 12:07:23.597872870 +0200 +@@ -1,3 +1,3 @@ +-export SUSE_IGNORED_RPATHS=/etc/ld.so.conf ++export SUSE_IGNORED_RPATHS=/etc/suse-ignored-rpaths.conf + export SUSE_ASNEEDED=1 + diff --git a/post-build-checks.changes b/post-build-checks.changes index 2eb4be4..5dc4b02 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 4 10:14:34 UTC 2012 - coolo@suse.com + +- ld.so is basically empty nowadays, so put together a config file + just to ignore rpaths + ------------------------------------------------------------------- Mon May 28 08:18:18 UTC 2012 - coolo@suse.com diff --git a/post-build-checks.spec b/post-build-checks.spec index 815d746..f1c2fd8 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -35,6 +35,7 @@ Url: http://gitorious.org/opensuse/post-build-checks Source0: %{name}-%{version}.tar.bz2 Patch0: new.diff Patch1: strim-whitespace.diff +Patch2: ignore-ldso.conf.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,6 +54,7 @@ it may not be a good idea to install this to a running system: %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # nothing to do @@ -67,6 +69,14 @@ install -m 755 helper/* $RPM_BUILD_ROOT/usr/lib/build/helper install -m 644 -D suse-buildsystem.sh $RPM_BUILD_ROOT/etc/profile.d/suse-buildsystem.sh chmod 755 $RPM_BUILD_ROOT/usr/lib/build/checks-data/check* +( echo %_libdir + echo /usr/local/%_lib + echo %_lib + echo %_libdir/Xaw3d + echo /usr/x86_64-suse-linux/lib + echo /opt/kde3/%_lib +) > $RPM_BUILD_ROOT/etc/suse-ignored-rpaths.conf + %check for i in tests/xx*.c do @@ -101,5 +111,6 @@ fi %doc COPYING /usr/lib/build /etc/profile.d/suse-buildsystem.sh +/etc/suse-ignored-rpaths.conf %changelog