SF.net SVN: gar:[22190] csw/mgar/pkg/gmake/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Oct 10 11:27:54 CEST 2013


Revision: 22190
          http://gar.svn.sourceforge.net/gar/?rev=22190&view=rev
Author:   dmichelsen
Date:     2013-10-10 09:27:54 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
gmake/trunk: Update to 4.0, usem modulations for guile-enabled build

Modified Paths:
--------------
    csw/mgar/pkg/gmake/trunk/Makefile
    csw/mgar/pkg/gmake/trunk/checksums

Modified: csw/mgar/pkg/gmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gmake/trunk/Makefile	2013-10-10 08:02:48 UTC (rev 22189)
+++ csw/mgar/pkg/gmake/trunk/Makefile	2013-10-10 09:27:54 UTC (rev 22190)
@@ -1,5 +1,5 @@
 NAME = make
-VERSION = 3.82
+VERSION = 4.0
 GARTYPE = v2
 
 DESCRIPTION = Controls generation of executables and other compile-related tasks
@@ -13,29 +13,65 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
+MASTER_SITES += ftp://alpha.gnu.org/gnu/make/
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
 VENDOR_URL = http://www.gnu.org/software/make/
 
+EXTRA_MODULATORS += GUILE
+MODULATIONS_GUILE = yes no
+
 PACKAGES = CSWgmake
 SPKG_DESC_CSWgmake = GNU Make controls generation of executables and other compile-related tasks
 RUNTIME_DEP_PKGS_CSWgmake += CSWlibintl8
 
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --program-prefix=g
-
 # These are hardcoded fallback pathes for include (see read.c):
 #   "/usr/gnu/include", "/usr/local/include", "/usr/include"
-CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake
+CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake-noguile
 
 # These are just examples
 CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/share/info/make.info-1
 CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/share/info/make.info-2
 
+PACKAGES += CSWgmake-guile
+SPKG_DESC_CSWgmake-guile = GNU Make with GUILE support
+PKGFILES_CSWgmake-guile += $(bindir)/gmake-guile
+RUNTIME_DEP_PKGS_CSWgmake-guile += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgmake-guile += CSWlibguile2-0-22
+# Needed, but unknown to checkpkg
+RUNTIME_DEP_PKGS_CSWgmake-guile += CSWgmake
+CHECKPKG_OVERRIDES_CSWgmake-guile += surplus-dependency|CSWgmake
+
+CHECKPKG_OVERRIDES_CSWgmake-guile += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake-guile
+
+# Guile was compiled with GCC, so make sure to use same here
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --program-prefix=g
+
+CONFIGURE_ARGS_guile-yes += --with-guile
+CONFIGURE_ARGS_guile-no += --without-guile
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_guile-$(GUILE))
+
+ MERGE_SCRIPTS_isa-default-guile-no = copy-all
+MERGE_SCRIPTS_isa-default-guile-yes = copy-guile-only
+
+EXTRA_PAX_ARGS_isa-default-guile-no += -s ",\($(bindir)/gmake\),\1-noguile,"
+
+ALTERNATIVES_CSWgmake = noguile
+ALTERNATIVES_CSWgmake-guile = guile
+ALTERNATIVE_noguile = $(bindir)/gmake gmake $(bindir)/gmake-noguile 100
+ALTERNATIVE_guile = $(bindir)/gmake gmake $(bindir)/gmake-guile 200
+
 include gar/category.mk
 
-post-install-modulated:
+post-install:
 	ginstall -d $(DESTDIR)$(prefix)/gnu
 	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
 	@$(MAKECOOKIE)
 
+merge-copy-guile-only:
+	ginstall -d $(PKGROOT)$(bindir)
+	ginstall $(INSTALLISADIR)$(bindir)/gmake $(PKGROOT)$(bindir)/gmake-guile
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/gmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/gmake/trunk/checksums	2013-10-10 08:02:48 UTC (rev 22189)
+++ csw/mgar/pkg/gmake/trunk/checksums	2013-10-10 09:27:54 UTC (rev 22190)
@@ -1 +1 @@
-1a11100f3c63fcf5753818e59d63088f  make-3.82.tar.bz2
+571d470a7647b455e3af3f92d79f1c18  make-4.0.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list