Attachment 295059 Details for Bug 433086 – patch to apply in spec file

[patch] patch to apply in spec file

smalltalk-3.0.1-system-libffi.patch (text/plain), 2.19 KB, created by Anthony Green on 2008-02-16 02:26:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Green

Created: 2008-02-16 02:26:03 UTC

Size: 2.19 KB

patch

obsolete

>--- configure.ac~	2008-02-15 17:29:59.000000000 -0800
>+++ configure.ac	2008-02-15 17:30:21.000000000 -0800
>@@ -72,8 +72,6 @@
> dnl 
> dnl ------------------------------ SUBDIRS --------------------
> 
>-AC_CONFIG_SUBDIRS(libffi)
>-
> case $ac_configure_args in
>   *--enable-subdir) ;;
>   *) ac_configure_args="$ac_configure_args --enable-subdir" ;;
>--- Makefile.am~	2008-02-15 17:29:59.000000000 -0800
>+++ Makefile.am	2008-02-15 17:31:19.000000000 -0800
>@@ -22,7 +22,7 @@
> PACKAGE=gnu-smalltalk
> gstdatadir=${libdir}/@PACKAGE@
> 
>-DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
>+DIST_SUBDIRS = lib-src snprintfv lightning opcode libgst \
> 	. $(ALL_PACKAGES) tests doc
> 
> SUBDIRS = lib-src lightning $(subdirs)
>--- libgst/Makefile.am.system-libffi	2008-02-15 17:51:16.000000000 -0800
>+++ libgst/Makefile.am	2008-02-15 17:58:49.000000000 -0800
>@@ -1,5 +1,8 @@
> LIBTOOL += --tag=LIBGST
> 
>+LIBFFI_INCLUDES = `pkg-config libffi --cflags`
>+LIBFFI_LIBS     = `pkg-config libffi --libs`
>+
> LEX_OUTPUT_ROOT = lex.yy
> ## CFLAGS=-O0 -g
> AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c
>@@ -7,8 +10,8 @@
> 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 $(LIBFFI_INCLUDES) \
>+  $(INCLIGHTNING) \
>   @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
> 
> if !HAVE_INSTALLED_LIGHTNING
>@@ -24,10 +27,10 @@
> # 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@
>+	-lffi @LIBSNPRINTFV@
> 
> 
> libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
>--- libgst/cint.c~	2008-01-22 02:14:32.000000000 -0800
>+++ libgst/cint.c	2008-02-15 18:09:06.000000000 -0800
>@@ -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

Actions: View | Diff

Attachments on bug 433086: 295059