rpms/gnu-smalltalk/devel gst-3.0.1-am.patch, NONE, 1.1 gst-3.0.1-ffi.patch, NONE, 1.1 gnu-smalltalk.spec, 1.32, 1.33 gst-3.0-am.patch, 1.2, NONE

Sun Feb 17 20:05:16 UTC 2008

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27444

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-3.0.1-am.patch gst-3.0.1-ffi.patch 
Removed Files:
	gst-3.0-am.patch 
Log Message:
Use system libffi for rawhide

gst-3.0.1-am.patch:

--- NEW FILE gst-3.0.1-am.patch ---
diff -up smalltalk-3.0.1/configure.ac.auto smalltalk-3.0.1/configure.ac
--- smalltalk-3.0.1/configure.ac.auto	2008-01-31 15:40:28.000000000 +0100
+++ smalltalk-3.0.1/configure.ac	2008-02-17 20:29:31.000000000 +0100
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 3.0.1, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 3.0.1, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -72,8 +72,6 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis
 dnl 
 dnl ------------------------------ SUBDIRS --------------------
 
-AC_CONFIG_SUBDIRS(libffi)
-
 case $ac_configure_args in
   *--enable-subdir) ;;
   *) ac_configure_args="$ac_configure_args --enable-subdir" ;;
@@ -88,7 +86,6 @@ AC_ARG_ENABLE(generational-gc,
         *) enable_generational_gc=yes ;;
 esac])
 if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
   AC_DEFINE(HAVE_SIGSEGV_H, 1,
     [Define to 1 if libsigsegv is being used])
 fi
diff -up smalltalk-3.0.1/libgst/Makefile.am.auto smalltalk-3.0.1/libgst/Makefile.am
--- smalltalk-3.0.1/libgst/Makefile.am.auto	2008-01-22 11:14:32.000000000 +0100
+++ smalltalk-3.0.1/libgst/Makefile.am	2008-02-17 20:35:29.000000000 +0100
@@ -7,8 +7,8 @@ AM_YFLAGS = -vy
 AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
   -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
   -DLIBEXEC_PATH=\"$(libexecdir)/$(PACKAGE)\" \
-  -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
-  -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
+  -I$(top_srcdir)/lib-src -I$(libdir)/libffi-3.0.1/include \
+  $(INCLIGHTNING) \
   @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
@@ -16,10 +16,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lightning
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
-
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -28,15 +24,11 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
 # definitions for libgst.la
 
 libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
+	-lffi @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
 
 libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+	 @LIBSNPRINTFV@
 
-if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
-endif
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
 	-export-symbols-regex "^gst_.*"
diff -up smalltalk-3.0.1/Makefile.am.auto smalltalk-3.0.1/Makefile.am
--- smalltalk-3.0.1/Makefile.am.auto	2008-01-24 13:21:21.000000000 +0100
+++ smalltalk-3.0.1/Makefile.am	2008-02-17 20:29:31.000000000 +0100
@@ -19,10 +19,10 @@
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
 
-PACKAGE=smalltalk
-gstdatadir=$(pkgdatadir)
+PACKAGE=gnu-smalltalk
+gstdatadir=${libdir}/@PACKAGE@
 
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning opcode libgst \
 	. $(ALL_PACKAGES) tests doc
 
 SUBDIRS = lib-src lightning $(subdirs)
@@ -57,6 +57,7 @@ dist_noinst_SCRIPTS = build-aux/texi2dvi
 ###########################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
+imagedir = ${libdir}/@PACKAGE@
 nodist_pkgconfig_DATA = gnu-smalltalk.pc
 
 pkglib_DATA = libc.la

gst-3.0.1-ffi.patch:

--- NEW FILE gst-3.0.1-ffi.patch ---
diff -up smalltalk-3.0.1/libgst/cint.c.ffi smalltalk-3.0.1/libgst/cint.c
--- smalltalk-3.0.1/libgst/cint.c.ffi	2008-02-17 20:27:26.000000000 +0100
+++ smalltalk-3.0.1/libgst/cint.c	2008-02-17 20:28:03.000000000 +0100
@@ -55,7 +55,7 @@
 #include "gstpriv.h"
 #include "re.h"
 
-#include "../libffi/include/ffi.h"
+#include <ffi.h>
 #include <ltdl.h>
 
 typedef struct symbol_type_map


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnu-smalltalk.spec	10 Feb 2008 20:45:28 -0000	1.32
+++ gnu-smalltalk.spec	17 Feb 2008 20:04:39 -0000	1.33
@@ -1,10 +1,11 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-3.0-am.patch
+Patch1: gst-3.0.1-am.patch
 Patch2: gst-3.0-tst117.patch
+Patch3: gst-3.0.1-ffi.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -28,6 +29,7 @@
 BuildRequires: libsigsegv-devel
 BuildRequires: mysql-devel
 BuildRequires: sqlite-devel
+BuildRequires: libffi-devel
 
 %description
 GNU Smalltalk is an implementation that closely follows the
@@ -68,6 +70,7 @@
 %setup -q -n smalltalk-%{version}
 %patch1 -p1 -b .auto
 %patch2 -p1 -b .tst117
+%patch3 -p1 -b .ffi
 
 %build
 autoreconf
@@ -170,6 +173,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sun Feb 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-2
+- Use system libffi
+
 * Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-1
 - New upstream release
 


--- gst-3.0-am.patch DELETED ---


