Fix stupid hardcoded libdir setting for 64bit arches

This commit is contained in:
Tom Callaway 2005-05-09 03:55:34 +00:00
parent 200cc925cc
commit 85b4bf9143
2 changed files with 19 additions and 1 deletions

11
librx-1.5-libdir64.patch Normal file
View File

@ -0,0 +1,11 @@
--- rx-1.5/rx/Makefile.in.BAD 2005-05-08 22:46:56.000000000 -0500
+++ rx-1.5/rx/Makefile.in 2005-05-08 22:47:16.000000000 -0500
@@ -25,7 +25,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+libdir = $(exec_prefix)/lib64
includedir = $(prefix)/include
infodir = $(prefix)/info

View File

@ -4,13 +4,14 @@
Summary: POSIX regexp functions Summary: POSIX regexp functions
Name: librx Name: librx
Version: 1.5 Version: 1.5
Release: 3%{?dist} Release: 4%{?dist}
License: GPL License: GPL
URL: http://www.gnu.org/software/rx/rx.html URL: http://www.gnu.org/software/rx/rx.html
Group: Applications/Text Group: Applications/Text
Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2 Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2
Patch0: rx-1.5-shared.patch Patch0: rx-1.5-shared.patch
Patch1: rx-1.5-texinfo.patch Patch1: rx-1.5-texinfo.patch
Patch2: librx-1.5-libdir64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: texinfo BuildRequires: texinfo
@ -37,6 +38,9 @@ This package contains files needed for development with librx.
%setup -q -n rx-%{version} %setup -q -n rx-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 -b .texipatch %patch1 -p1 -b .texipatch
%ifarch x86_64 ppc64 sparc64
%patch2 -p1 -b .64bit
%endif
%build %build
%configure %configure
@ -82,6 +86,9 @@ fi
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Sun May 8 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.5-4
- Fix 64 bit arches to install to the right libdir
* Thu May 5 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.5-3 * Thu May 5 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.5-3
- add BuildRequires: texinfo - add BuildRequires: texinfo