- Avoid standard rpaths on lib64 archs.
This commit is contained in:
parent
bfc99404f9
commit
330eeb71e8
22
opensc-0.10.1-rpath64.patch
Normal file
22
opensc-0.10.1-rpath64.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
--- opensc-0.10.1/configure~ 2006-01-08 23:03:28.000000000 +0200
|
||||||
|
+++ opensc-0.10.1/configure 2006-02-15 22:52:09.000000000 +0200
|
||||||
|
@@ -9016,7 +9016,7 @@
|
||||||
|
# Append ld.so.conf contents to the search path
|
||||||
|
if test -f /etc/ld.so.conf; then
|
||||||
|
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||||
|
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||||
|
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||||
|
--- opensc-0.10.1/aclocal.m4~ 2006-01-08 23:03:24.000000000 +0200
|
||||||
|
+++ opensc-0.10.1/aclocal.m4 2006-02-15 22:50:47.000000000 +0200
|
||||||
|
@@ -1581,7 +1581,7 @@
|
||||||
|
# Append ld.so.conf contents to the search path
|
||||||
|
if test -f /etc/ld.so.conf; then
|
||||||
|
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||||
|
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||||
|
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
Name: opensc
|
Name: opensc
|
||||||
Version: 0.10.1
|
Version: 0.10.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Smart card library and applications
|
Summary: Smart card library and applications
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: LGPL
|
License: LGPL
|
||||||
URL: http://www.opensc.org/
|
URL: http://www.opensc.org/
|
||||||
Source0: http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
|
Source0: http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: %{name}-0.10.1-rpath64.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: pcsc-lite-devel >= 1.1.1
|
BuildRequires: pcsc-lite-devel >= 1.1.1
|
||||||
@ -50,6 +51,8 @@ OpenSC development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
# patch0: --disable-rpath doesn't seem to do what it implies
|
||||||
|
%patch0 -p1
|
||||||
cp -p src/pkcs15init/README ./README.pkcs15init
|
cp -p src/pkcs15init/README ./README.pkcs15init
|
||||||
cp -p src/scconf/README.scconf .
|
cp -p src/scconf/README.scconf .
|
||||||
|
|
||||||
@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-2
|
||||||
|
- Avoid standard rpaths on lib64 archs.
|
||||||
|
|
||||||
* Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-1
|
* Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-1
|
||||||
- 0.10.1.
|
- 0.10.1.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user