Remove stray patch reference

This commit is contained in:
Anthony Green 2011-08-23 11:00:57 -04:00
parent a95b47f910
commit 2919e3ec1a
4 changed files with 6 additions and 67 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
libffi-3.0.9.tar.gz libffi-3.0.9.tar.gz
/libffi-3.0.10.tar.gz

View File

@ -1,63 +0,0 @@
diff -up libffi-3.0.9/include/ffi.h.in.defines libffi-3.0.9/include/ffi.h.in
--- libffi-3.0.9/include/ffi.h.in.defines 2010-07-03 22:25:07.000000000 +0200
+++ libffi-3.0.9/include/ffi.h.in 2010-07-03 22:25:35.000000000 +0200
@@ -57,7 +57,9 @@ extern "C" {
#endif
/* Specify which architecture libffi is configured for. */
+#ifndef @TARGET@
#define @TARGET@
+#endif
/* ---- System configuration information --------------------------------- */
diff -up libffi-3.0.9/src/powerpc/ffitarget.h.defines libffi-3.0.9/src/powerpc/ffitarget.h
--- libffi-3.0.9/src/powerpc/ffitarget.h.defines 2010-07-03 22:26:56.000000000 +0200
+++ libffi-3.0.9/src/powerpc/ffitarget.h 2010-07-03 22:27:20.000000000 +0200
@@ -31,12 +31,18 @@
/* ---- System specific configurations ----------------------------------- */
#if defined (POWERPC) && defined (__powerpc64__) /* linux64 */
+#ifndef POWERPC64
#define POWERPC64
+#endif
#elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */
+#ifndef POWERPC64
#define POWERPC64
+#endif
#elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */
+#ifndef POWERPC64
#define POWERPC64
#endif
+#endif
#ifndef LIBFFI_ASM
typedef unsigned long ffi_arg;
diff -up libffi-3.0.9/src/s390/ffitarget.h.defines libffi-3.0.9/src/s390/ffitarget.h
--- libffi-3.0.9/src/s390/ffitarget.h.defines 2010-07-03 22:27:41.000000000 +0200
+++ libffi-3.0.9/src/s390/ffitarget.h 2010-07-03 22:27:53.000000000 +0200
@@ -28,8 +28,10 @@
#define LIBFFI_TARGET_H
#if defined (__s390x__)
+#ifndef S390X
#define S390X
#endif
+#endif
/* ---- System specific configurations ----------------------------------- */
diff -up libffi-3.0.9/src/sparc/ffitarget.h.defines libffi-3.0.9/src/sparc/ffitarget.h
--- libffi-3.0.9/src/sparc/ffitarget.h.defines 2010-07-03 22:28:09.000000000 +0200
+++ libffi-3.0.9/src/sparc/ffitarget.h 2010-07-03 22:28:23.000000000 +0200
@@ -30,8 +30,10 @@
/* ---- System specific configurations ----------------------------------- */
#if defined(__arch64__) || defined(__sparcv9)
+#ifndef SPARC64
#define SPARC64
#endif
+#endif
#ifndef LIBFFI_ASM
typedef unsigned long ffi_arg;

View File

@ -1,5 +1,5 @@
Name: libffi Name: libffi
Version: 3.0.9 Version: 3.0.10
Release: 3%{?dist} Release: 3%{?dist}
Summary: A portable foreign function interface library Summary: A portable foreign function interface library
@ -8,7 +8,6 @@ License: BSD
URL: http://sourceware.org/libffi URL: http://sourceware.org/libffi
Source0: http://sourceware.org/libffi/libffi-%{version}.tar.gz Source0: http://sourceware.org/libffi/libffi-%{version}.tar.gz
# part of upstream commit 5feacad4 # part of upstream commit 5feacad4
Patch0: %{name}-3.0.9-defines.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@ -54,7 +53,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .defines
%build %build
@ -100,6 +98,9 @@ fi
%{_infodir}/libffi.info.gz %{_infodir}/libffi.info.gz
%changelog %changelog
* Tue Aug 23 2011 Anthony Green <green@redhat.com> - 3.0.10-1
- Upgrade to 3.0.10.
* Fri Mar 18 2011 Dan Horák <dan[at]danny.cz> - 3.0.9-3 * Fri Mar 18 2011 Dan Horák <dan[at]danny.cz> - 3.0.9-3
- added patch for being careful when defining relatively generic symbols - added patch for being careful when defining relatively generic symbols

View File

@ -1 +1 @@
1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz 79390673f5d07a8fb342bc09b5055b6f libffi-3.0.10.tar.gz