[csw-devel] SF.net SVN: gar:[9542] csw/mgar/pkg/libffi/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Mon Apr 5 02:18:02 CEST 2010
Revision: 9542
http://gar.svn.sourceforge.net/gar/?rev=9542&view=rev
Author: hson
Date: 2010-04-05 00:18:02 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
libffi: Add patches
Modified Paths:
--------------
csw/mgar/pkg/libffi/trunk/Makefile
csw/mgar/pkg/libffi/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch
csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch
csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch
Removed Paths:
-------------
csw/mgar/pkg/libffi/trunk/files/sun.patch
Modified: csw/mgar/pkg/libffi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libffi/trunk/Makefile 2010-04-04 23:38:43 UTC (rev 9541)
+++ csw/mgar/pkg/libffi/trunk/Makefile 2010-04-05 00:18:02 UTC (rev 9542)
@@ -16,8 +16,11 @@
MASTER_SITES = ftp://sourceware.org/pub/libffi/
SPKG_SOURCEURL = http://sourceware.org/libffi/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-# Not needed unless using SOS12 compiler
-#PATCHFILES = sun.patch
+# Not needed unless using SOS compiler
+#PATCHFILE += Makefile.in.patch
+# Not really needed for build, but for SOS compiler using libffi
+PATCHFILE += ffi_common.h.patch
+PATCHFILE += ffi_target.h.patch
PACKAGES = CSWlibffi CSWlibffidevel
CATALOGNAME_CSWlibffi = libffi
Modified: csw/mgar/pkg/libffi/trunk/checksums
===================================================================
--- csw/mgar/pkg/libffi/trunk/checksums 2010-04-04 23:38:43 UTC (rev 9541)
+++ csw/mgar/pkg/libffi/trunk/checksums 2010-04-05 00:18:02 UTC (rev 9542)
@@ -1,2 +1 @@
1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz
-e888c31e7320d06c4268f3e3d90394a7 sun.patch
Added: csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch
===================================================================
--- csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch (rev 0)
+++ csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch 2010-04-05 00:18:02 UTC (rev 9542)
@@ -0,0 +1,12 @@
+diff -Nru libffi-3.0.9.orig/Makefile.in libffi-3.0.9/Makefile.in
+--- libffi-3.0.9.orig/Makefile.in 2009-12-31 13:41:43.000000000 +0100
++++ libffi-3.0.9/Makefile.in 2010-01-30 08:19:09.733833212 +0100
+@@ -478,7 +478,7 @@
+ $(am__append_24) $(am__append_25)
+ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+-AM_CFLAGS = -Wall -g -fexceptions
++AM_CFLAGS =
+ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS)
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
Added: csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch
===================================================================
--- csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch (rev 0)
+++ csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch 2010-04-05 00:18:02 UTC (rev 9542)
@@ -0,0 +1,12 @@
+diff -Nru libffi-3.0.9.orig/include/ffi_common.h libffi-3.0.9/include/ffi_common.h
+--- libffi-3.0.9.orig/include/ffi_common.h 2009-12-29 16:22:26.000000000 +0100
++++ libffi-3.0.9/include/ffi_common.h 2010-01-30 08:20:33.829433399 +0100
+@@ -84,7 +84,7 @@
+ } extended_cif;
+
+ /* Terse sized type definitions. */
+-#if defined(_MSC_VER) || defined(__sgi)
++#if defined(_MSC_VER) || defined(__sgi) || defined(__sun)
+ typedef unsigned char UINT8;
+ typedef signed char SINT8;
+ typedef unsigned short UINT16;
Added: csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch
===================================================================
--- csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch (rev 0)
+++ csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch 2010-04-05 00:18:02 UTC (rev 9542)
@@ -0,0 +1,25 @@
+diff -Nru libffi-3.0.9.orig/src/x86/ffitarget.h libffi-3.0.9/src/x86/ffitarget.h
+--- libffi-3.0.9.orig/src/x86/ffitarget.h 2009-12-29 16:22:26.000000000 +0100
++++ libffi-3.0.9/src/x86/ffitarget.h 2010-01-30 08:23:16.480398204 +0100
+@@ -31,7 +31,7 @@
+
+ /* ---- System specific configurations ----------------------------------- */
+
+-#if defined (X86_64) && defined (__i386__)
++#if defined (X86_64) && (defined (__i386__) || defined (__i386))
+ #undef X86_64
+ #define X86
+ #endif
+@@ -74,10 +74,10 @@
+ #else
+
+ /* ---- Intel x86 and AMD x86-64 - */
+-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
++#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64))
+ FFI_SYSV,
+ FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+ FFI_DEFAULT_ABI = FFI_SYSV,
+ #else
+ FFI_DEFAULT_ABI = FFI_UNIX64,
Deleted: csw/mgar/pkg/libffi/trunk/files/sun.patch
===================================================================
--- csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-04-04 23:38:43 UTC (rev 9541)
+++ csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-04-05 00:18:02 UTC (rev 9542)
@@ -1,49 +0,0 @@
-diff -Nru libffi-3.0.9.orig/Makefile.in libffi-3.0.9/Makefile.in
---- libffi-3.0.9.orig/Makefile.in 2009-12-31 13:41:43.000000000 +0100
-+++ libffi-3.0.9/Makefile.in 2010-01-30 08:19:09.733833212 +0100
-@@ -478,7 +478,7 @@
- $(am__append_24) $(am__append_25)
- libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
- nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
--AM_CFLAGS = -Wall -g -fexceptions
-+AM_CFLAGS =
- libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS)
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)
-diff -Nru libffi-3.0.9.orig/include/ffi_common.h libffi-3.0.9/include/ffi_common.h
---- libffi-3.0.9.orig/include/ffi_common.h 2009-12-29 16:22:26.000000000 +0100
-+++ libffi-3.0.9/include/ffi_common.h 2010-01-30 08:20:33.829433399 +0100
-@@ -84,7 +84,7 @@
- } extended_cif;
-
- /* Terse sized type definitions. */
--#if defined(_MSC_VER) || defined(__sgi)
-+#if defined(_MSC_VER) || defined(__sgi) || defined(__sun)
- typedef unsigned char UINT8;
- typedef signed char SINT8;
- typedef unsigned short UINT16;
-diff -Nru libffi-3.0.9.orig/src/x86/ffitarget.h libffi-3.0.9/src/x86/ffitarget.h
---- libffi-3.0.9.orig/src/x86/ffitarget.h 2009-12-29 16:22:26.000000000 +0100
-+++ libffi-3.0.9/src/x86/ffitarget.h 2010-01-30 08:23:16.480398204 +0100
-@@ -31,7 +31,7 @@
-
- /* ---- System specific configurations ----------------------------------- */
-
--#if defined (X86_64) && defined (__i386__)
-+#if defined (X86_64) && (defined (__i386__) || defined (__i386))
- #undef X86_64
- #define X86
- #endif
-@@ -74,10 +74,10 @@
- #else
-
- /* ---- Intel x86 and AMD x86-64 - */
--#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
-+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64))
- FFI_SYSV,
- FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
--#ifdef __i386__
-+#if defined(__i386__) || defined(__i386)
- FFI_DEFAULT_ABI = FFI_SYSV,
- #else
- FFI_DEFAULT_ABI = FFI_UNIX64,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list