[csw-devel] SF.net SVN: gar:[8381] csw/mgar/pkg/libffi/trunk

Mon Feb 8 01:21:23 CET 2010

Revision: 8381
          http://gar.svn.sourceforge.net/gar/?rev=8381&view=rev
Author:   hson
Date:     2010-02-08 00:21:23 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
Add 64-bit build
Switch to Sun Studio
Split package

Modified Paths:
--------------
    csw/mgar/pkg/libffi/trunk/Makefile
    csw/mgar/pkg/libffi/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libffi/trunk/files/sun.patch

Modified: csw/mgar/pkg/libffi/trunk/Makefile
===================================================================

--- csw/mgar/pkg/libffi/trunk/Makefile	2010-02-07 21:09:50 UTC (rev 8380)
+++ csw/mgar/pkg/libffi/trunk/Makefile	2010-02-08 00:21:23 UTC (rev 8381)
@@ -1,5 +1,5 @@
 GARNAME = libffi
-GARVERSION = 3.0.8
+GARVERSION = 3.0.9
 CATEGORIES = lib
 
 DESCRIPTION = A portable foreign function interface library
@@ -16,22 +16,43 @@
 MASTER_SITES = ftp://sourceware.org/pub/libffi/
 SPKG_SOURCEURL = http://sourceware.org/libffi/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = sun.patch
 
-PACKAGES = CSWlibffi
+PACKAGES = CSWlibffi CSWlibffidevel
 CATALOGNAME_CSWlibffi = libffi
+CATALOGNAME_CSWlibffidevel = libffi_devel
 SPKG_DESC_CSWlibffi = $(DESCRIPTION)
+SPKG_DESC_CSWlibffidevel = $(DESCRIPTION) - developer package
 
+PKGFILES_CSWlibffidevel = $(PKGFILES_DEVEL)
 
-RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert
+LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of 
-# new upstream software release
+RUNTIME_DEP_PKGS_CSWlibffidevel += CSWlibffi
+#RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-GARCOMPILER = GCC4
+GARCOMPILER = SOS12
 BUILD64 = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-TEST_SCRIPTS =
-TEST_TARGET = check
+
+# Tests fail since they are written for gcc only
+#TEST_TARGET = check
+TEST_TARGET = 
+
 include gar/category.mk
+
+
+# v9.S is not needed when building 32-bit
+pre-configure-isa-sparcv8:
+	@( cd $(WORKSRC); gsed -e "s|src/sparc/v9.S||" -e "s/AM_CFLAGS = .*/AM_CFLAGS = /" -i Makefile.am ; \
+		aclocal; \
+		automake)
+
+# v8.S will not build when building 64-bit
+pre-configure-isa-sparcv9:
+	@( cd $(WORKSRC); gsed -e "s|src/sparc/v8.S||" -e "s/AM_CFLAGS = .*/AM_CFLAGS = /" -i Makefile.am ; \
+		aclocal; \
+		automake)

Modified: csw/mgar/pkg/libffi/trunk/checksums
===================================================================
--- csw/mgar/pkg/libffi/trunk/checksums	2010-02-07 21:09:50 UTC (rev 8380)
+++ csw/mgar/pkg/libffi/trunk/checksums	2010-02-08 00:21:23 UTC (rev 8381)
@@ -1 +1,2 @@
-188a4f79fdac2310044b44b7d3918ef9  download/libffi-3.0.8.tar.gz
+1f300a7a7f975d4046f51c3022fa5ff1  libffi-3.0.9.tar.gz
+e888c31e7320d06c4268f3e3d90394a7  sun.patch

Added: csw/mgar/pkg/libffi/trunk/files/sun.patch
===================================================================
--- csw/mgar/pkg/libffi/trunk/files/sun.patch	                        (rev 0)
+++ csw/mgar/pkg/libffi/trunk/files/sun.patch	2010-02-08 00:21:23 UTC (rev 8381)
@@ -0,0 +1,58 @@
+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,
+@@ -96,7 +96,7 @@
+ #define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2)
+ #define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3)
+ 
+-#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
++#if defined (X86_64) || ((defined (__x86_64__) || defined (__x86_64)) && defined (X86_DARWIN))
+ #define FFI_TRAMPOLINE_SIZE 24
+ #define FFI_NATIVE_RAW_API 0
+ #else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
