Attachment 295168 Details for Bug 433293 – source patch

[patch] source patch

plt-system-libffi.patch (text/plain), 4.80 KB, created by Anthony Green on 2008-02-18 14:10:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Green

Created: 2008-02-18 14:10:32 UTC

Size: 4.80 KB

patch

obsolete

>--- src/foreign/Makefile.in~	2005-06-29 12:28:16.000000000 -0700
>+++ src/foreign/Makefile.in	2008-02-18 05:16:19.000000000 -0800
>@@ -6,18 +6,12 @@
> CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ \
>          -I$(builddir)/../mzscheme \
>          -I$(srcdir)/../mzscheme/include -I$(srcdir)/../mzscheme/src \
>-         -Igcc/libffi/include
>+         `pkg-config libffi --cflags`
> ARFLAGS = @ARFLAGS@
> 
> # compile sub-libraries & foreign.c
> all:
> 	$(MAKE) foreign.@LTO@
>-	$(MAKE) gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la
>-
>-# Causes objects to be generated in gcc/libffi/src/
>-#  in inconvenience mode:
>-gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la:
>-	cd gcc/libffi; $(MAKE) libffi@FOREIGN_CONVENIENCE@.la
> 
> foreign.@LTO@: $(srcdir)/foreign.c \
>            $(srcdir)/../mzscheme/include/scheme.h \
>@@ -27,4 +21,3 @@
> 
> clean:
> 	rm -f foreign.@LTO@
>-	cd gcc/libffi; $(MAKE) clean
>--- src/mzscheme/Makefile.in~	2007-01-12 16:17:00.000000000 -0800
>+++ src/mzscheme/Makefile.in	2008-02-18 05:36:49.000000000 -0800
>@@ -27,8 +27,8 @@
> 
> FOREIGN_DIR = ../foreign
> FOREIGN_OBJ = $(FOREIGN_DIR)/foreign.@LTO@
>-FOREIGN_OBJS = $(FOREIGN_OBJ) $(FOREIGN_DIR)/gcc/libffi/src/*.@LTO@ $(FOREIGN_DIR)/gcc/libffi/src/*/*.@LTO@
>-FOREIGN_LIB = $(FOREIGN_OBJ) ../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la
>+FOREIGN_OBJS = $(FOREIGN_OBJ)
>+FOREIGN_LIB = $(FOREIGN_OBJ)
> FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
> # Dependency always uses FOREIGN_LIB, but linker uses FOREIGN_OBJSLIB. The
> #  FOREIGN_OBJSLIB expansion has too many "*"s to be a valid make target,
>@@ -136,7 +136,7 @@
> # Unix ----------------------------------------
> 
> mzscheme@CGC@@NOT_OSX@: libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(SPECIALIZINGOBJECTS)
>-	@MZLINKER@ -o mzscheme@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LDFLAGS@ @LIBS@
>+	@MZLINKER@ -o mzscheme@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ `pkg-config libffi --libs` @LDFLAGS@ @LIBS@
> 
> # Mac OS ----------------------------------------
> 
>--- src/mzscheme/gc2/Makefile.in~	2007-08-06 15:02:51.000000000 -0700
>+++ src/mzscheme/gc2/Makefile.in	2008-02-18 05:44:25.000000000 -0800
>@@ -208,7 +208,7 @@
> $(XSRCDIR)/vector.c: ../src/vector.@LTO@ $(XFORMDEP)
> 	$(XFORM) $(XSRCDIR)/vector.c $(SRCDIR)/vector.c
> $(XSRCDIR)/foreign.c: ../../foreign/foreign.@LTO@ $(XFORMDEP)
>-	$(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) -I../../foreign/gcc/libffi/include -I${SRCDIR}/../../mzscheme/src" -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c
>+	$(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) `pkg-config libffi --cflags` -I${SRCDIR}/../../mzscheme/src" -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c
> $(XSRCDIR)/main.c: ../main.@LTO@ $(XFORMDEP)
> 	$(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_COLLECTS_DIR) $(srcdir)/../main.c
> 
>@@ -302,8 +302,8 @@
>        $(srcdir)/weak.c $(srcdir)/fnls.c $(srcdir)/../include/scheme.h $(srcdir)/../src/schpriv.h
> 	$(CC) $(CFLAGS) -c $(srcdir)/gc2.c -o gc2.@LTO@
> 
>-FOREIGN_OBJS = ../../foreign/gcc/libffi/src/*.@LTO@ ../../foreign/gcc/libffi/src/*/*.@LTO@
>-FOREIGN_LIB = ../../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la
>+FOREIGN_OBJS = 
>+FOREIGN_LIB = 
> FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
> 
> EXTRA_OBJS_T = ../src/gmp.@LTO@ @FOREIGN_LIB_IF_USED@
>@@ -314,7 +314,7 @@
> 	$(RANLIB) ../libmzscheme3m.@LIBSFX@
> 
> ../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@
>-	cd ..; @MZLINKER@ -o mzscheme@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS)
>+	cd ..; @MZLINKER@ -o mzscheme@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libmzscheme3m.@LIBSFX@ `pkg-config libffi --libs` @LDFLAGS@ $(LIBS)
> # The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode,
> #  at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative
> #  path.
>--- src/mred/gc2/Makefile.in~	2007-08-06 15:02:51.000000000 -0700
>+++ src/mred/gc2/Makefile.in	2008-02-18 05:55:45.000000000 -0800
>@@ -1351,9 +1351,9 @@
> 
> MREDLINKER = @MREDLINKER@
> 
>-FOREIGN_OBJS = ../../foreign/gcc/libffi/src/*.@LTO@ ../../foreign/gcc/libffi/src/*/*.@LTO@
>-FOREIGN_LIB = ../../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.@LTA@
>-FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
>+FOREIGN_OBJS = 
>+FOREIGN_LIB = 
>+FOREIGN_OBJSLIB = 
> 
> EXTRA_MZ_OBJS = ../../mzscheme/src/gmp.@LTO@ $(FOREIGN_OBJSLIB)
> 
>@@ -1371,7 +1371,7 @@
> 	$(RANLIB) ../libmred3m.@LIBSFX@
> 
> ../mred@MMM@@NOT_OSX@: mrmain.@LTO@ ../libmred3m.@LIBSFX@
>-	$(MREDLINKER) $(MREDLDFLAGS) -o ../mred@MMM@ mrmain.@LTO@ ../libmred3m.@LIBSFX@ $(MREDMZOBJS_@LIBSFX@) $(MREDLIBS_@LIBSFX@)
>+	$(MREDLINKER) $(MREDLDFLAGS) -o ../mred@MMM@ mrmain.@LTO@ ../libmred3m.@LIBSFX@ $(MREDMZOBJS_@LIBSFX@) `pkg-config libffi --libs` $(MREDLIBS_@LIBSFX@)
> 
> MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd
> MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc

Actions: View | Diff

Attachments on bug 433293: 295168