Simplify the libffi build

We now put the libffi objects into the RTS library, rather than trying
to mangle libffi into being a ghc package itself. It would be nicer to
 make it a separate library (but not a ghc package), but for now
 hopefully this will get the build going through on Windows again.

1 files changed, 21 insertions, 165 deletions

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 3aa1cbc296..f6e99c2e58 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -11,75 +11,18 @@
 # -----------------------------------------------------------------------------
 
 
-# We package libffi as Haskell package for two reasons: 
-
-# 1) GHC uses different names for shared and static libs, so it can
-#    choose the lib variant to link with on its own. With regular
-#    libtool styled shared lib names, the linker would interfer and
-#    link against the shared lib variant even when GHC runs in -static
-#    mode.
-# 2) The first issue isn't a problem when a shared lib of libffi would
-#    be installed in system locations, but we do not assume that. So,
-#    when running in -dynamic mode, we must either install libffi to
-#    system locations ourselves, or we must add its location to
-#    respective environment variable, (DY)LD_LIBRARY_PATH etc...before
-#    we call dynamically linked binaries. Especially, the latter is
-#    necessary as GHC calls binary it produced before its installation
-#    phase. However, both mechanism, installing to system locations or
-#    modifying (DY)LD_LIBRARY_PATH, are already in place for Haskell
-#    packages so with packaging libffi as Haskell package we reuse
-#    them naturally.
-
-# -----------------------------------------------------------------------------
-#
-# We use libffi's own configuration stuff.
-
-# 2007-07-05
-# Passing
-#     as_ln_s='cp -p'
-# isn't sufficient to stop cygwin using symlinks the mingw gcc can't
-# follow, as it isn't used consistently. Instead we put an ln.bat in
-# path that always fails.
-
 ifeq "$(BuildSharedLibs)" "YES"
 libffi_STAMP_CONFIGURE = libffi/stamp.ffi.configure-shared
 libffi_STAMP_BUILD     = libffi/stamp.ffi.build-shared
+libffi_STAMP_INSTALL   = libffi/stamp.ffi.install-shared
 else
 libffi_STAMP_CONFIGURE = libffi/stamp.ffi.configure
 libffi_STAMP_BUILD     = libffi/stamp.ffi.build
+libffi_STAMP_INSTALL   = libffi/stamp.ffi.install
 endif
 
-BINDIST_STAMPS = libffi/stamp.ffi.build libfii/stamp.ffi.configure
-
-INSTALL_HEADERS   += libffi/dist-install/build/ffi.h \
-		     libffi/dist-install/build/ffitarget.h
-libffi_STATIC_LIB  = libffi/dist-install/build/libffi.a
-INSTALL_LIBS      += libffi/dist-install/build/libHSffi.a \
-                     libffi/dist-install/build/libHSffi_p.a \
-                     libffi/dist-install/build/HSffi.o
-
-# We have to add the GHC version to the name of our dynamic libs, because
-# they will be residing in the system location along with dynamic libs from
-# other GHC installations.
-
-libffi_HS_DYN_LIB_NAME = libHSffi$(dyn_libsuf)
-libffi_HS_DYN_LIB      = libffi/dist-install/build/$(libffi_HS_DYN_LIB_NAME)
-
-ifeq "$(Windows)" "YES"
-libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a
-libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
-else
-libffi_DYNAMIC_PROG =
-ifeq "$(darwin_TARGET_OS)" "1"
-libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) \
-                      libffi/dist-install/build/libffi.5$(soext)
-else ifeq "$(openbsd_TARGET_OS)" "1"
-libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so.5.10
-else
-libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \
-                      libffi/dist-install/build/libffi.so.5
-endif
-endif
+libffi_STATIC_LIB  = libffi/build/inst/lib/libffi.a
+ffi_HEADER         = rts/dist/build/ffi.h
 
 ifeq "$(BuildSharedLibs)" "YES"
 libffi_EnableShared=yes
@@ -87,29 +30,21 @@ else
 libffi_EnableShared=no
 endif
 
-ifeq "$(BuildSharedLibs)" "YES"
-INSTALL_LIBS  += $(libffi_HS_DYN_LIB)
-ifeq "$(Windows)" "YES"
-INSTALL_PROGS += $(libffi_HS_DYN_LIB).a
-endif
-endif
-
-# We have to fake a non-working ln for configure, so that the fallback
-# option (cp -p) gets used instead.  Otherwise the libffi build system
-# will use cygwin symbolic linkks which cannot be read by mingw gcc.
-# The same trick is played by the GMP build in ../gmp.
-
 ifneq "$(BINDIST)" "YES"
 $(libffi_STAMP_CONFIGURE):
 	"$(RM)" $(RM_OPTS_REC) $(LIBFFI_DIR) libffi/build
 	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
 	mv libffi/libffi-* libffi/build
+
+# We have to fake a non-working ln for configure, so that the fallback
+# option (cp -p) gets used instead.  Otherwise the libffi build system
+# will use cygwin symbolic links which cannot be read by mingw gcc.
 	chmod +x libffi/ln
 
 # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
 # warnings off or the compilation of libffi might fail due to warnings
 	cd libffi && \
-	    PATH=`pwd`:$$PATH; \
+	    PATH=$(TOP)/libffi:$$PATH; \
 	    export PATH; \
 	    cd build && \
 	    CC=$(CC_STAGE1) \
@@ -119,24 +54,11 @@ $(libffi_STAMP_CONFIGURE):
         CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -w" \
         LDFLAGS="$(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE1) -w" \
         "$(SHELL)" configure \
+	          --prefix=$(TOP)/libffi/build/inst \
 	          --enable-static=yes \
 	          --enable-shared=$(libffi_EnableShared) \
 	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
 
-	cp libffi/build/*/libtool libffi/build
-
-	# libffi.so needs to be built with the correct soname.
-	# NOTE: this builds libffi_convience.so with the incorrect
-	# soname, but we don't need that anyway!
-	cd libffi && \
-	  "$(CP)" build/libtool build/libtool.orig && \
-	  sed -e s/soname_spec=.*/soname_spec="$(libffi_HS_DYN_LIB_NAME)"/ build/libtool.orig > build/libtool
-
-	# We don't want libtool's cygwin hacks
-	cd libffi && \
-	  "$(CP)" build/libtool build/libtool.orig && \
-	  sed -e s/dlname=\'\$$tdlname\'/dlname=\'\$$dlname\'/ build/libtool.orig > build/libtool
-
 	# wc on OS X has spaces in its output, which libffi's Makefile
 	# doesn't expect, so we tweak it to sed them out
 	mv libffi/build/Makefile libffi/build/Makefile.orig
@@ -144,89 +66,23 @@ $(libffi_STAMP_CONFIGURE):
 
 	touch $@
 
-libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) libffi/dist-install/build/ffitarget.h | $$(dir $$@)/.
-	"$(CP)" libffi/build/*/include/ffi.h $@
-
-libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/.
-	"$(CP)" libffi/build/*/include/ffitarget.h $@
-
-$(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/.
+$(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE)
 	$(MAKE) -C libffi/build MAKEFLAGS=
-	cd libffi/build && ./libtool --mode=install cp */libffi.la $(TOP)/libffi/dist-install/build
-
-	# We actually want both static and dllized libraries, because we build
-	#   the runtime system both ways. libffi_convenience.a is the static version.
-ifeq "$(Windows)" "YES"
-	cp libffi/build/.libs/libffi_convenience.a $(libffi_STATIC_LIB)
-endif
-
 	touch $@
 
-$(libffi_STATIC_LIB): $(libffi_STAMP_BUILD)
-	@test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; }
-
-# Rename libffi.a to libHSffi.a
-libffi/dist-install/build/libHSffi.a: $(libffi_STATIC_LIB)
-	"$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi.a
-
-libffi/dist-install/build/libHSffi_p.a: $(libffi_STATIC_LIB)
-	"$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi_p.a
-
-$(eval $(call all-target,libffi,$(INSTALL_HEADERS) $(INSTALL_LIBS)))
-
-# The GHCi import lib isn't needed as compiler/ghci/Linker.lhs + rts/Linker.c
-# link the interpreted references to FFI to the compiled FFI.
-# Instead of adding libffi to the list preloaded packages (see
-# compiler/ghci/Linker.lhs:emptyPLS) we generate an empty HSffi.o
-
-libffi/dist-install/build/HSffi.o: libffi/dist-install/build/libHSffi.a
-	cd libffi/dist-install/build && \
-	  touch empty.c && \
-	  "$(CC_STAGE1)" $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -c empty.c -o HSffi.o
-
-$(eval $(call all-target,libffi,libffi/dist-install/build/HSffi.o))
-
-ifeq "$(BuildSharedLibs)" "YES"
-ifeq "$(Windows)" "YES"
-libffi/dist-install/build/libffi.dll.a $(libffi_HS_DYN_LIB): $(libffi_STAMP_BUILD)
-	@test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; }
+$(libffi_STAMP_INSTALL): $(libffi_STAMP_BUILD)
+	$(MAKE) -C libffi/build MAKEFLAGS= install
+	touch $@
 
-# Windows libtool creates <soname>.dll, and as we already patched that
-# there is no need to copy from libffi.dll to libHSffi...dll.
-# However, the renaming is still required for the import library
-# libffi.dll.a.
-$(libffi_HS_DYN_LIB).a: libffi/dist-install/build/libffi.dll.a | $$(dir $$@)/.
-	"$(CP)" $< $@
+$(libffi_STATIC_LIB): $(libffi_STAMP_INSTALL)
+	@test -f $@ || { echo "$< exists, but $@ does not."; echo "Suggest removing $<."; exit 1; }
 
-$(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a))
-
-else
-$(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD)
-	@test -f $@ || { echo "$< exits, but $@ does not."; echo "Suggest removing $<."; exit 1; }
-
-# Rename libffi.so to libHSffi...so
-$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/.
-	"$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB)
-ifeq "$(darwin_TARGET_OS)" "1"
-	# Ensure library's install name is correct before anyone links with it.
-	install_name_tool -id $(ghclibdir)/$(libffi_HS_DYN_LIB_NAME) $(libffi_HS_DYN_LIB)
-endif
-
-$(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB)))
-endif
-endif
+$(ffi_HEADER): $(libffi_STAMP_INSTALL) | $$(dir $$@)/.
+	cp libffi/build/inst/lib/libffi-*/include/ffitarget.h $(dir $@)
+	cp libffi/build/inst/lib/libffi-*/include/ffi.h $@
 
 $(eval $(call clean-target,libffi,, \
-   libffi/build libffi/stamp.ffi.* libffi/dist-install))
-endif
-
-#-----------------------------------------------------------------------------
-# Do the package config
+    libffi/build libffi/stamp.ffi.* libffi/dist-install))
 
-$(eval $(call manual-package-config,libffi))
-
-#-----------------------------------------------------------------------------
-#
-# binary-dist
+endif
 
-BINDIST_EXTRAS += libffi/package.conf.in