system-libffi

This patch could be replaced by a configure call if
http://hackage.haskell.org/trac/ghc/ticket/5743 were fixed.

Gbp-Pq: Name system-libffi

diff --git a/ghc.mk b/ghc.mk
index 06b1403e495c586a7e0ac125193849086bafcfb3..f9a31f820efadc86f8e729190c5b9d21760d330b 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -600,7 +600,6 @@ BUILD_DIRS += \
    $(MAYBE_GHCI) \
    driver/ghc \
    driver/haddock \
-   libffi \
    includes \
    rts
 

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 9fdf6bebb5f75c6b07b21c5d012997d8a2c96260..cf8effdd8e0b4c690563cb5aa77154fbdbc6a9f9 100644 (file)
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -177,12 +177,12 @@ rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
 # Making a shared library for the RTS.
 ifneq "$$(findstring dyn, $1)" ""
 ifeq "$$(HostOS_CPP)" "mingw32" 
-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/$$(LIBFFI_DLL)
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
        "$$(RM)" $$(RM_OPTS) $$@
        "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
          -no-auto-link-packages -Lrts/dist/build -l$(LIBFFI_WINDOWS_LIB) `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
 else
-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend
        "$$(RM)" $$(RM_OPTS) $$@
        "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
          -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
@@ -193,9 +193,9 @@ ifeq "$$(darwin_HOST_OS)" "1"
 endif
 endif
 else
-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) $$(rts_ffi_objs_stamp)
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS)
        "$$(RM)" $$(RM_OPTS) $$@
-       echo $$(rts_ffi_objs) $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \
+       echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \
                $$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@
 endif
 
@@ -509,10 +509,8 @@ endif
 # installing
 
 INSTALL_LIBS += $(ALL_RTS_LIBS)
-INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
-INSTALL_LIBS += $(wildcard rts/dist/build/$(LIBFFI_DLL))
 
-install: install_libffi_headers
+install:
 
 .PHONY: install_libffi_headers
 install_libffi_headers :

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 727b586a09e0bcfa862ed74d58978dda199dbdd0..a1e912cfad665607b7a5f30a6323f8d9e5e6330e 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -24,8 +24,9 @@ library-dirs:         TOP"/rts/dist/build" PAPI_LIB_DIR
 hs-libraries:   "HSrts"
 
 extra-libraries:
+                               "ffi"
 #ifdef HAVE_LIBM
-                               "m"             /* for ldexp() */
+                             , "m"             /* for ldexp() */
 #endif
 #ifdef HAVE_LIBRT
                              , "rt"