X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=6c22535dbdc593f2e298f8320e00edd48af4185f;hp=ea2d3b2ab9446d538bc3985ee04cf36301bddade;hb=430453c5131592b6147a80202dc5f7fbe3f3d5fd;hpb=956293b3f44d493bb55c5fb569d94824c4b6fe45

diff --git a/mk/package.mk b/mk/package.mk
index ea2d3b2..6c22535 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,9 +3,6 @@
 
 ifneq "$(PACKAGE)" ""
 
-# FIXME: does anyone do this any more?
-STANDALONE_PACKAGE = NO
-
 # -----------------------------------------------------------------------------
 # Directory layouts, installation etc.
 
@@ -25,13 +22,8 @@ PKG_DATADIR = $$topdir
 
 else
 
-ifeq "$(BIN_DIST)" ""
-PKG_LIBDIR  = $(libdir)
-PKG_DATADIR = $(datadir)
-else
 PKG_LIBDIR  = $$libdir
 PKG_DATADIR = $$datadir
-endif
 
 endif # Unix
 
@@ -61,11 +53,7 @@ HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock
 
 ifeq "$(way)" ""
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
-else
-PACKAGE_CPP_OPTS += -Iinclude
-endif
 
 PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
 PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
@@ -109,7 +97,6 @@ package.conf.installed : package.conf.in
 # to 'make clean' in ghc without cleaning in libraries too, the packages
 # will be correctly re-installed.
 #
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 
 STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
 CLEAN_FILES += $(STAMP_PKG_CONF)
@@ -119,31 +106,12 @@ boot all :: $(STAMP_PKG_CONF)
 endif
 
 $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
-	$(GHC_PKG_INPLACE) --force --update-package <package.conf.inplace
-	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --force --update-package <package.conf.installed
+	$(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
+	$(GHC_PKG_INPLACE) update - -f $(GHC_DRIVER_DIR)/package.conf --force-files <package.conf.installed
 	@touch $(STAMP_PKG_CONF)
 
 CLEAN_FILES += package.conf.installed package.conf.inplace 
 
-else # $(STANDALONE_PACKAGE) == "YES"
-
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
-PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
-PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
-
-# Let the package configuration file refer to $(libdir) as
-# ${pkglibdir}.  Note we can't use ${libdir} because ghc-pkg already
-# redefines it to point to GHC's libdir (bug or feature?).
-#
-install :: package.conf.installed
-	$(GHC_PKG) --force --update-package <package.conf.installed
-
-# Invoke this rule by hand in order to use the package in-place
-install-inplace-pkg : package.conf.inplace
-	$(GHC_PKG) --force --update-package <package.conf.inplace
-
-endif # $(STANDALONE_PACKAGE)
-
 endif # $(way) == ""
 
 # -----------------------------------------------------------------------------
@@ -151,22 +119,13 @@ endif # $(way) == ""
 
 SRC_HSC2HS_OPTS += -I.
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+ifneq "$(NO_SET_HC)" "YES"
 HC = $(GHC_INPLACE)
-IGNORE_PACKAGE_FLAG = -ignore-package
-else
-# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
-# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
-ifeq "$(strip $(GHC))" ""
-IGNORE_PACKAGE_FLAG = -ignore-package
-else
-# Making the assumption here that standalone packages will be using mk/config.mk:GHC
-IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi)
-endif 
-endif # STANDALONE_PACKAGE
+endif
+IGNORE_PACKAGE_FLAG = -package-name  $(PACKAGE)-$(VERSION)
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG) $(PACKAGE)
+SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG)
 SRC_HC_OPTS 	+= $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif
@@ -238,15 +197,10 @@ endif
 # -----------------------------------------------------------------------------
 # Dependencies
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 MKDEPENDHS = $(GHC_INPLACE)
-endif
 
 SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
-
-ifeq "$(STANDALONE_PACKAGE)" "NO"
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
-endif
 
 endif # $(PACKAGE) != ""
 
@@ -314,21 +268,35 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
     # About the options used for Darwin:
     # -dynamiclib
     #   Apple's way of saying -shared
-    # -flat_namespace -undefined suppress:
+    # -undefined dynamic_lookup:
     #   Without these options, we'd have to specify the correct dependencies
-    #   for each of the dylibs. Twolevel namespaces are in general a good thing
-    #   (they make things more robust), so we should fix this sooner or later.
+    #   for each of the dylibs. Note that we could (and should) do without this
+    #	for all libraries except the RTS; all we need to do is to pass the
+    #	correct HSfoo_dyn.dylib files to the link command.
+    #	This feature requires Mac OS X 10.3 or later; there is a similar feature,
+    #	-flat_namespace -undefined suppress, which works on earlier versions,
+    #	but it has other disadvantages.
+    # -single_module
+    #	Build the dynamic library as a single "module", i.e. no dynamic binding
+    #	nonsense when referring to symbols from within the library. The NCG
+    #	assumes that this option is specified (on i386, at least).
+    # -Wl,-macosx_version_min -Wl,10.3
+    #	Tell the linker its safe to assume that the library will run on 10.3 or
+    #	later, so that it will not complain about the use of the option
+    #	-undefined dynamic_lookup above.
     # -install_name
     #   Causes the dynamic linker to ignore the DYLD_LIBRARY_PATH when loading
     #   this lib and instead look for it at its absolute path.
     #   When installing the .dylibs (see target.mk), we'll change that path to
-    #   point to the place they are installed.
-    #   Note: I'm not yet sure about this, but I think it will be convenient for
-    #         users not to have to set up DYLD_LIBRARY_PATH to point to the GHC
-    #         library dir. -- Wolfgang
+    #   point to the place they are installed. Therefore, we won't have to set
+    #	up DYLD_LIBRARY_PATH specifically for ghc.
 
 $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
-	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
+	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) \
+		-undefined dynamic_lookup -single_module \
+		 -Wl,-macosx_version_min -Wl,10.3 \
+		-install_name `pwd`/$@
+
 else
 DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY))
 
@@ -356,7 +324,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
 
-HTML_DIR = ../html/$(PACKAGE)
+HTML_DIR = ../html-docs/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""
@@ -375,25 +343,31 @@ html :: $(HTML_DOC)
 extraclean :: 
 	$(RM) -rf $(HTML_DIR)
 
+ifneq "$(findstring $(PACKAGE), $(CorePackages))" ""
+HaddockSourceURL = $(CorePackageSourceURL)
+else
+HaddockSourceURL = $(ExtraPackageSourceURL)
+endif
+
 $(HTML_DOC) : $(HS_PPS)
 	@$(INSTALL_DIR) $(HTML_DIR)
 	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
 		--package=$(PACKAGE) \
 		--dump-interface=$(PACKAGE).haddock \
 		--use-index=../doc-index.html --use-contents=../index.html \
+		--source-module=$(HaddockSourceURL) \
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
 
 CLEAN_FILES += $(PACKAGE).haddock
 
 %.raw-hs : %.lhs
-	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 %.raw-hs : %.hs
-	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
-#  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on
 
 install-docs :: $(HTML_DOC)
 	@$(INSTALL_DIR) $(HTML_INSTALL_DIR)