rpms
/
libffi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix include path (and .pc file). resolves bz727301

This commit is contained in:
Tom Callaway 2013-05-25 22:18:14 -04:00
parent f05ce374d5
commit c6030192ad
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libffi-3.0.13-fix-include-path.patch Normal file
View File

@ -0,0 +1,34 @@
diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
--- libffi-3.0.13/include/Makefile.am.fixpath 2013-05-25 22:11:25.983889342 -0400
+++ libffi-3.0.13/include/Makefile.am 2013-05-25 22:12:12.337890037 -0400
@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
DISTCLEANFILES=ffitarget.h
EXTRA_DIST=ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)/
nodist_includes_HEADERS = ffi.h ffitarget.h
diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
--- libffi-3.0.13/include/Makefile.in.fixpath 2013-05-25 22:12:56.259890696 -0400
+++ libffi-3.0.13/include/Makefile.in 2013-05-25 22:13:12.101890934 -0400
@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = ffitarget.h
EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)/
nodist_includes_HEADERS = ffi.h ffitarget.h
all: all-am
diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
--- libffi-3.0.13/libffi.pc.in.fixpath 2013-05-25 22:14:21.037891968 -0400
+++ libffi-3.0.13/libffi.pc.in 2013-05-25 22:14:31.652892128 -0400
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces

10
libffi.spec
View File

@ -1,6 +1,6 @@
Name: libffi
Version: 3.0.13
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A portable foreign function interface library
Group: System Environment/Libraries
@ -8,6 +8,8 @@ License: BSD
URL: http://sourceware.org/libffi
Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
# part of upstream commit 5feacad4
Patch0: libffi-3.0.13-fix-include-path.patch
# part of upstream commit 5feacad4
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@ -53,6 +55,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .fixpath
%build
@ -92,12 +95,15 @@ fi
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
%{_libdir}/%{name}-%{version}
%{_includedir}/ffi*.h
%{_libdir}/*.so
%{_mandir}/man3/*.gz
%{_infodir}/libffi.info.gz
%changelog
* Sat May 25 2013 Tom Callaway <spot@fedoraproject.org> - 3.0.13-2
- fix incorrect header pathing (and .pc file)
* Wed Mar 20 2013 Anthony Green <green@redhat.com> - 3.0.13-1
- update to 3.0.13