Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 64f1baa282f8f4ebd059cea1102e21f4 > files > 2

ghc-7.4.2-2.mga3.src.rpm

Index: ghc-7.4.2/ghc.mk
===================================================================
--- ghc-7.4.2/ghc.mk
+++ ghc-7.4.2/ghc.mk	2013-01-05 20:21:08.000000000 +0000
@@ -579,7 +579,6 @@
    driver/ghci \
    driver/ghc \
    driver/haddock \
-   libffi \
    includes \
    rts
 
Index: ghc-7.4.2/rts/ghc.mk
===================================================================
--- ghc-7.4.2/rts/ghc.mk
+++ ghc-7.4.2/rts/ghc.mk	2013-01-05 20:22:59.000000000 +0000
@@ -177,7 +177,7 @@
 	"$$(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 +188,9 @@
 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 +504,8 @@
 # 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 :
Index: ghc-7.4.2/rts/package.conf.in
===================================================================
--- ghc-7.4.2/rts/package.conf.in
+++ ghc-7.4.2/rts/package.conf.in	2013-01-05 20:20:37.000000000 +0000
@@ -24,8 +24,9 @@
 hs-libraries:   "HSrts"
 
 extra-libraries:
+                		"ffi"
 #ifdef HAVE_LIBM
-                		"m"		/* for ldexp() */
+                	     , 	"m"		/* for ldexp() */
 #endif
 #ifdef HAVE_LIBRT
 			      , "rt"