rpms/sane-backends
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix --enable-rpath

Browse Source
This commit is contained in:
Nils Philippsen 2009-08-31 16:04:19 +00:00
parent 076270c041
commit 5c8da1246b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sane-backends-1.0.20-rpath.patch
View File

@ -1,11 +1,17 @@
commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f commit 1249be5ecbd635feeb880b2c60582b34bc04a798
Author: Nils Philippsen <nils@redhat.com> Author: Nils Philippsen <nils@redhat.com>
Date: Tue Jun 16 16:59:43 2009 +0200 Date: Mon Aug 31 16:38:23 2009 +0200
patch: rpath path: rpath
Squashed commit of the following: Squashed commit of the following:
commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f
Author: Nils Philippsen <nils@redhat.com>
Date: Mon Aug 31 16:34:42 2009 +0200
fix --enable-rpath
commit be2982b2d1ae4d889b4cecec289336b4b03579aa commit be2982b2d1ae4d889b4cecec289336b4b03579aa
Author: Nils Philippsen <nils@redhat.com> Author: Nils Philippsen <nils@redhat.com>
Date: Tue Jun 2 16:12:23 2009 +0200 Date: Tue Jun 2 16:12:23 2009 +0200
@ -15,10 +21,10 @@ Date: Tue Jun 16 16:59:43 2009 +0200
make using runtime library search path configurable make using runtime library search path configurable
diff --git a/acinclude.m4 b/acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4
index 6413b60..c6f5800 100644 index 6413b60..b2bb065 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -383,19 +383,31 @@ dnl @@ -383,19 +383,29 @@ dnl
AC_DEFUN([SANE_LINKER_RPATH], AC_DEFUN([SANE_LINKER_RPATH],
[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !! [dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644
+ AC_MSG_CHECKING([whether runtime link path should be used]) + AC_MSG_CHECKING([whether runtime link path should be used])
+ AC_ARG_ENABLE([rpath], + AC_ARG_ENABLE([rpath],
+ [AS_HELP_STRING([--enable-rpath], + [AS_HELP_STRING([--enable-rpath],
+ [use runtime library search path @<:@default=yes@:>@])] + [use runtime library search path @<:@default=yes@:>@])])
+ [],
+ [enable_readline=yes])
+ +
+ LINKER_RPATH= + LINKER_RPATH=
+ AS_IF([test "x$enable_rpath" != xno], + AS_IF([test "x$enable_rpath" != xno],

5
sane-backends.spec
View File

@ -1,7 +1,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.20 Version: 1.0.20
Release: 6%{?dist} Release: 7%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -157,6 +157,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc %{_libdir}/pkgconfig/sane-backends.pc
%changelog %changelog
* Fri Aug 31 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-7
- fix --enable-rpath
* Mon Aug 03 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-6 * Mon Aug 03 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-6
- remove ExcludeArch: s390 s390x - remove ExcludeArch: s390 s390x

2
sources
View File

@ -1,2 +1,2 @@
a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz
cd71d7e8a2ea0c1a8d51901317f50d39 sane-backends-1.0.20-autoreconf.patch.bz2 55134659213e74bc1d9d5326102072b4 sane-backends-1.0.20-autoreconf.patch.bz2