[Pkg-haskell-commits] darcs: ghc: Refresh ./patches/system-libffi

Joachim Breitner mail at joachim-breitner.de
Sat Jan 15 07:12:56 UTC 2011


Sat Jan 15 07:00:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/system-libffi
  Ignore-this: 3c51b68d4b57da4be3b3ed01c73a9f0

    M ./patches/system-libffi -74 +74

Sat Jan 15 07:00:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/system-libffi
  Ignore-this: 3c51b68d4b57da4be3b3ed01c73a9f0
diff -rN -u old-ghc/patches/system-libffi new-ghc/patches/system-libffi
--- old-ghc/patches/system-libffi	2011-01-15 07:12:56.323437203 +0000
+++ new-ghc/patches/system-libffi	2011-01-15 07:12:56.335437835 +0000
@@ -1,75 +1,12 @@
-Index: ghc6-6.12.3/ghc.mk
+Index: ghc-7.0.1/rts/ghc.mk
 ===================================================================
---- ghc6-6.12.3.orig/ghc.mk	2010-06-09 21:10:12.000000000 +0300
-+++ ghc6-6.12.3/ghc.mk	2010-07-17 11:52:25.000000000 +0300
-@@ -369,11 +369,6 @@
- endif
- BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB))
- 
--OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
--ifeq "$(BuildSharedLibs)" "YES"
--OTHER_LIBS  += libffi/dist-install/build/libHSffi$(dyn_libsuf)
--endif
--
- # We cannot run ghc-cabal to configure a package until we have
- # configured and registered all of its dependencies.  So the following
- # hack forces all the configure steps to happen in exactly the order
-@@ -406,7 +401,6 @@
- # add the final two package.conf dependencies: ghc-prim depends on RTS,
- # and RTS depends on libffi.
- libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace
--rts/package.conf.inplace : libffi/package.conf.inplace
- endif
- 
- # -----------------------------------------------------------------------------
-@@ -518,7 +512,6 @@
-    driver \
-    driver/ghci \
-    driver/ghc \
--   libffi \
-    includes \
-    rts
- 
-@@ -863,11 +856,10 @@
-                          $(addprefix libraries/,$(PACKAGES_STAGE2))
- 
- install_packages: install_libexecs
--install_packages: libffi/package.conf.install rts/package.conf.install
-+install_packages: rts/package.conf.install
- 	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
- 	"$(RM)" -r $(RM_OPTS) "$(INSTALLED_PACKAGE_CONF)"
- 	$(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"
--	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install
- 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
- 	$(foreach p, $(ALL_INSTALLED_PACKAGES),\
- 	    "$(GHC_CABAL_INPLACE)" install \
-@@ -942,7 +934,7 @@
- unix-binary-dist-prep:
- 	"$(RM)" $(RM_OPTS) -r bindistprep/
- 	"$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
--	set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
-+	set -e; for i in LICENSE compiler ghc rts libraries utils docs includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
- 	echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
- 	echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
- 	echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
-@@ -1020,7 +1012,7 @@
- #
- # Files to include in source distributions
- #
--SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries ghc-tarballs
-+SRC_DIST_DIRS = mk rules docs distrib bindisttest includes utils docs rts compiler ghc driver libraries ghc-tarballs
- SRC_DIST_FILES += \
- 	configure.ac config.guess config.sub configure \
- 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
-Index: ghc6-6.12.3/rts/ghc.mk
-===================================================================
---- ghc6-6.12.3.orig/rts/ghc.mk	2010-06-09 21:10:14.000000000 +0300
-+++ ghc6-6.12.3/rts/ghc.mk	2010-07-17 11:52:25.000000000 +0300
-@@ -333,15 +333,13 @@
+--- ghc-7.0.1.orig/rts/ghc.mk	2011-01-15 12:29:51.000000000 +0530
++++ ghc-7.0.1/rts/ghc.mk	2011-01-15 12:29:53.000000000 +0530
+@@ -430,15 +430,13 @@
  
  $(eval $(call build-dependencies,rts,dist,1))
  
--$(rts_dist_depfile) : libffi/dist-install/build/ffi.h
+-$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
 -
  #-----------------------------------------------------------------------------
  # libffi stuff
@@ -84,12 +21,12 @@
 +rts_LD_OPTS     += $(shell pkg-config --libs libffi)
  
  # -----------------------------------------------------------------------------
- # compile generic patchable dyn-wrapper
-Index: ghc6-6.12.3/rts/package.conf.in
+ # compile dtrace probes if dtrace is supported
+Index: ghc-7.0.1/rts/package.conf.in
 ===================================================================
---- ghc6-6.12.3.orig/rts/package.conf.in	2010-06-09 21:10:14.000000000 +0300
-+++ ghc6-6.12.3/rts/package.conf.in	2010-07-17 11:53:57.000000000 +0300
-@@ -28,8 +28,9 @@
+--- ghc-7.0.1.orig/rts/package.conf.in	2011-01-15 12:29:51.000000000 +0530
++++ ghc-7.0.1/rts/package.conf.in	2011-01-15 12:29:53.000000000 +0530
+@@ -24,8 +24,9 @@
  hs-libraries:   "HSrts"
  
  extra-libraries:
@@ -100,7 +37,7 @@
  #endif
  #ifdef HAVE_LIBRT
  			      , "rt"
-@@ -59,7 +60,6 @@
+@@ -55,7 +56,6 @@
  #endif
  
  includes:		Stg.h
@@ -108,3 +45,66 @@
  hugs-options:
  cc-options:
  
+Index: ghc-7.0.1/ghc.mk
+===================================================================
+--- ghc-7.0.1.orig/ghc.mk	2011-01-15 12:29:56.000000000 +0530
++++ ghc-7.0.1/ghc.mk	2011-01-15 12:30:20.000000000 +0530
+@@ -437,7 +437,6 @@
+ # add the final two package.conf dependencies: ghc-prim depends on RTS,
+ # and RTS depends on libffi.
+ libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace
+-rts/package.conf.inplace : libffi/package.conf.inplace
+ endif
+ 
+ # --------------------------------
+@@ -452,11 +451,6 @@
+ endif
+ BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
+ 
+-OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
+-ifeq "$(BuildSharedLibs)" "YES"
+-OTHER_LIBS  += libffi/dist-install/build/libHSffi$(dyn_libsuf)
+-endif
+-
+ # ----------------------------------------
+ # Special magic for the ghc-prim package
+ 
+@@ -581,7 +575,6 @@
+    driver/ghci \
+    driver/ghc \
+    driver/haddock \
+-   libffi \
+    includes \
+    rts
+ 
+@@ -937,11 +930,10 @@
+ 
+ # Now we can do the installation
+ install_packages: install_libexecs
+-install_packages: libffi/package.conf.install rts/package.conf.install
++install_packages: rts/package.conf.install
+ 	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
+ 	"$(RM)" $(RM_OPTS_REC) "$(INSTALLED_PACKAGE_CONF)"
+ 	$(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"
+-	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install
+ 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
+ 	$(foreach p, $(INSTALLED_PKG_DIRS),                           \
+ 	    $(call make-command,                                      \
+@@ -1024,7 +1016,7 @@
+ unix-binary-dist-prep:
+ 	"$(RM)" $(RM_OPTS_REC) bindistprep/
+ 	"$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
+-	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
++	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
+ 	echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
+ 	echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
+ 	echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
+@@ -1102,7 +1094,7 @@
+ #
+ # Files to include in source distributions
+ #
+-SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries ghc-tarballs
++SRC_DIST_DIRS = mk rules docs distrib bindisttest includes utils docs rts compiler ghc driver libraries ghc-tarballs
+ SRC_DIST_FILES += \
+ 	configure.ac config.guess config.sub configure \
+ 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \





More information about the Pkg-haskell-commits mailing list