Revision: 11522
http://gar.svn.sourceforge.net/gar/?rev=11522&view=rev
Author: bdwalton
Date: 2010-11-08 01:34:48 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
gar/v2: convert AP2_MODS to use build instead of custom cswap2mod CAS
Modified Paths:
--------------
csw/mgar/gar/v2/gar.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2010-11-07 22:32:12 UTC (rev 11521)
+++ csw/mgar/gar/v2/gar.mk 2010-11-08 01:34:48 UTC (rev 11522)
@@ -805,7 +805,7 @@
# The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge merge-do merge-license merge-classutils
merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp)
$(if $(NOSOURCEPACKAGE),,merge-src) post-merge
+merge: checksum pre-merge merge-do merge-license merge-classutils
merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp)
$(if $(NOSOURCEPACKAGE),,merge-src) $(if $(AP2_MODS),post-merge-ap2mod)
post-merge
@$(DONADA)
merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential)
@@ -833,6 +833,9 @@
echo "Building all ISAs in parallel. Please see the individual
logfiles for details:";$(foreach M,$(MODULATIONS),echo "-
$(WORKROOTDIR)/build-$M/build.log";)\
)
+post-merge-ap2mod:
+ $(GARBIN)/ap2mod_build_scripts $(PKGROOT) $(AP2_MODFILES)
+ @$(MAKECOOKIE)
# This merges the
merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION)
$(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
@@ -881,7 +884,7 @@
.PHONY: remerge reset-merge reset-merge-modulated
remerge: reset-merge merge
-reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS))
reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides
reset-merge-alternatives reset-merge-src
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS))
reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides
reset-merge-alternatives reset-merge-ap2mod reset-merge-src
@rm -f $(COOKIEDIR)/pre-merge $(foreach
M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge
$(COOKIEDIR)/post-merge
@rm -rf $(PKGROOT)
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2010-11-07 22:32:12 UTC (rev 11521)
+++ csw/mgar/gar/v2/gar.pkg.mk 2010-11-08 01:34:48 UTC (rev 11522)
@@ -188,9 +188,9 @@
# This is the default path for texinfo pages to be picked up. Extend or
replace as necessary.
TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO)
-# if AP2_MODS is set, files matching this pattern will have cswap2mod
-# set as their class
-AP2_MODFILES ?= /opt/csw/apache2/libexec/.*\.so $(EXTRA_AP2_MODFILES)
+# if AP2_MODS is set, files matching this shell glob (passed to find)
+# will have 'build' set as their class
+AP2_MODFILES ?= opt/csw/apache2/libexec/*so $(EXTRA_AP2_MODFILES)
# - set class for all config files
_CSWCLASS_FILTER = | perl -ane '\
@@ -204,7 +204,7 @@
$(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~
m(^$(FILE)$$) );)\
$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] =
"cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\
$(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~
m(^$(FILE)$$) );)\
- $(if $(AP2_MODS),$(foreach FILE,$(AP2_MODFILES),$$F[1] =
"cswap2mod" if( $$F[2] =~ m(^$(FILE)$$) );))\
+ $(if $(AP2_MODS),@F = ("e", "build", $$F[2], "?", "?", "?") if
($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \
print join(" ",@F),"\n";'
# If you add another filter above, also add the class to this list. It is used
@@ -224,7 +224,6 @@
_CSWCLASSES += cswinetd
_CSWCLASSES += cswinitsmf
_CSWCLASSES += cswtexinfo
-_CSWCLASSES += cswap2mod
_CSWCLASSES += cswpostmsg
# Make sure the configuration files always have a .CSW suffix and rename the
@@ -458,7 +457,6 @@
# actually matching the _TEXINFO_FILTER. This is done at the prototype-level.
$(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype
$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq
"cswalternatives")')),CSWalternatives)
-$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq
"cswap2mod")')),CSWapache2)
$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n"
if( $$F[1] eq "$C");)')),CSWcswclassutils)
# The final "true" is for packages without dependencies to make the shell
happy as "( )" is not allowed.
@@ -569,7 +567,7 @@
# The texinfo filter has been taken out of the normal filters as TEXINFO has a
default.
$(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype
$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq
"cswalternatives")')),cswalternatives)
-$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq
"cswap2mod")')),cswap2mod)
+$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(strip $(shell cat
$(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq
"build")')),build)
$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype |
perl -e 'while(<>){...@f=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print
"$C\n" if( $$c{$C});)')
$(WORKDIR)/%.pkginfo: $(WORKDIR)
@@ -638,6 +636,9 @@
reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup
reset-merge-inetdconf reset-merge-etcservices
+reset-merge-ap2mod:
+ @rm -f $(COOKIEDIR)/post-merge-ap2mod
+
merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or
$(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
