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 591f8f697e8025da0aa55caf9d0a37ccfe8eb9a5..01866ff8af890d9a20c55027aaaa71c09f7975e5 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -579,7 +579,6 @@ BUILD_DIRS += \
    driver/ghci \
    driver/ghc \
    driver/haddock \
-   libffi \
    includes \
    rts
 

diff --git a/rts/ghc.mk b/rts/ghc.mk
index e2e00c66e67c7803dc9b435d1fa8b196d041ac4a..7653a615323f98a0dbc78ea4e94e46b9b26bbfa0 100644 (file)
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -86,8 +86,7 @@ ifeq  "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_RTS_DEF_LIBNAMES   = base ghc-prim
 ALL_RTS_DEF_LIBS       = \
        rts/dist/build/win32/libHSbase.dll.a \
-       rts/dist/build/win32/libHSghc-prim.dll.a \
-       libffi/build/inst/lib/libffi.dll.a
+       rts/dist/build/win32/libHSghc-prim.dll.a 
 
 # -- import libs for the regular Haskell libraries
 define make-importlib-def # args $1 = lib name
@@ -172,12 +171,12 @@ rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
 # Making a shared library for the RTS.
 ifneq "$$(findstring dyn, $1)" ""
 ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/libffi-5.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 -lffi-5 `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) \
@@ -188,9 +187,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
 
@@ -504,10 +503,8 @@ endif
 # installing
 
 INSTALL_LIBS += $(ALL_RTS_LIBS)
-INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
-INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.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 6651e5e5cef3836c66db120f6389e7bbf8e54da8..a6a69454fb53635ec72b54fe8c47815bc7177164 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"