From ef5b4b146aa172d8ac10f39b5eb3d7a0f948d8f1 Mon Sep 17 00:00:00 2001 From: simonmar Date: Fri, 26 Nov 2004 16:22:13 +0000 Subject: [project @ 2004-11-26 16:19:45 by simonmar] Further integration with the new package story. GHC now supports pretty much everything in the package proposal. - GHC now works in terms of PackageIds (-) rather than just package names. You can still specify package names without versions on the command line, as long as the name is unambiguous. - GHC understands hidden/exposed modules in a package, and will refuse to import a hidden module. Also, the hidden/eposed status of packages is taken into account. - I had to remove the old package syntax from ghc-pkg, backwards compatibility isn't really practical. - All the package.conf.in files have been rewritten in the new syntax, and contain a complete list of modules in the package. I've set all the versions to 1.0 for now - please check your package(s) and fix the version number & other info appropriately. - New options: -hide-package P sets the expose flag on package P to False -ignore-package P unregisters P for this compilation For comparison, -package P sets the expose flag on package P to True, and also causes P to be linked in eagerly. -package-name is no longer officially supported. Unofficially, it's a synonym for -ignore-package, which has more or less the same effect as -package-name used to. Note that a package may be hidden and yet still be linked into the program, by virtue of being a dependency of some other package. To completely remove a package from the compiler's internal database, use -ignore-package. The compiler will complain if any two packages in the transitive closure of exposed packages contain the same module. You *must* use -ignore-package P when compiling modules for package P, if package P (or an older version of P) is already registered. The compiler will helpfully complain if you don't. The fptools build system does this. - Note: the Cabal library won't work yet. It still thinks GHC uses the old package config syntax. Internal changes/cleanups: - The ModuleName type has gone away. Modules are now just (a newtype of) FastStrings, and don't contain any package information. All the package-related knowledge is in DynFlags, which is passed down to where it is needed. - DynFlags manipulation has been cleaned up somewhat: there are no global variables holding DynFlags any more, instead the DynFlags are passed around properly. - There are a few less global variables in GHC. Lots more are scheduled for removal. - -i is now a dynamic flag, as are all the package-related flags (but using them in {-# OPTIONS #-} is Officially Not Recommended). - make -j now appears to work under fptools/libraries/. Probably wouldn't take much to get it working for a whole build. --- mk/package.mk | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'mk/package.mk') diff --git a/mk/package.mk b/mk/package.mk index c533050dfb..bff2772058 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.41 2004/11/23 12:35:12 ross Exp $ +# $Id: package.mk,v 1.42 2004/11/26 16:22:13 simonmar Exp $ ifneq "$(PACKAGE)" "" @@ -17,20 +17,35 @@ endif ifeq "$(way)" "" ifeq "$(STANDALONE_PACKAGE)" "NO" -PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR) -Iinclude +PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude else -PKGCONF_CPP_EXTRA_OPTS = -Iinclude +PACKAGE_CPP_OPTS += -Iinclude endif +PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE} +PACKAGE_CPP_OPTS += -DVERSION=${VERSION} + +IMPORT_DIR_INSTALLED = $$libdir/imports +IMPORT_DIR_INPLACE = $$libdir/libraries/$(PACKAGE) + +LIB_DIR_INSTALLED = $$libdir +LIB_DIR_INPLACE = $$libdir/libraries/$(PACKAGE) + package.conf.inplace : package.conf.in - $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \ + $(CPP) $(RAWCPP_FLAGS) -P \ + -DIMPORT_DIR='"$(IMPORT_DIR_INPLACE)"' \ + -DLIB_DIR='"$(LIB_DIR_INPLACE)"' \ + -x c $(PACKAGE_CPP_OPTS) $< | \ grep -v '^#pragma GCC' | \ - sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@ + sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@ package.conf.installed : package.conf.in - $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \ + $(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \ + -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \ + -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \ + -x c $(PACKAGE_CPP_OPTS) $< | \ grep -v '^#pragma GCC' | \ - sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@ + sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@ # we could be more accurate here and add a dependency on # ghc/driver/package.conf, but that doesn't work too well because of @@ -61,7 +76,6 @@ CLEAN_FILES += package.conf.installed package.conf.inplace else # $(STANDALONE_PACKAGE) == "YES" -PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\" PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))' PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\" PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\" @@ -92,7 +106,7 @@ endif SRC_HSC2HS_OPTS += -I. ifeq "$(NON_HS_PACKAGE)" "" -SRC_HC_OPTS += -package-name $(PACKAGE) +SRC_HC_OPTS += -ignore-package $(PACKAGE) SRC_HC_OPTS += $(GhcLibHcOpts) SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) endif -- cgit v1.2.1