Revision: 20018
http://gar.svn.sourceforge.net/gar/?rev=20018&view=rev
Author: chninkel
Date: 2013-01-03 20:16:05 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
gar/v2-yann: merge last changes from the main branch
Modified Paths:
--------------
csw/mgar/gar/v2-yann/gar.mk
Property Changed:
----------------
csw/mgar/gar/v2-yann/
Property changes on: csw/mgar/gar/v2-yann
___________________________________________________________________
Modified: svn:mergeinfo
- /csw/mgar/gar/v2:4936-6678,19234-20010
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-raised-buildlevel:15906-15949
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-solaris11:18134-18236
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270
+ /csw/mgar/gar/v2:4936-6678,19234-20017
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-raised-buildlevel:15906-15949
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-solaris11:18134-18236
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270
Modified: csw/mgar/gar/v2-yann/gar.mk
===================================================================
--- csw/mgar/gar/v2-yann/gar.mk 2013-01-03 19:50:51 UTC (rev 20017)
+++ csw/mgar/gar/v2-yann/gar.mk 2013-01-03 20:16:05 UTC (rev 20018)
@@ -157,7 +157,6 @@
$(call _modulate_target_nocookie,reset-test,$(2),$(4))
$(call _modulate_target,install,$(2),$(4))
$(call _modulate_target_nocookie,reset-install,$(2),$(4))
-#$(call _modulate_target,merge,$(2),$(4))
$(call _modulate_merge,,$(2),$(4))
$(call _modulate_target_nocookie,reset-merge,$(2),$(4))
$(call _modulate_target_nocookie,clean,$(2),$(4))
@@ -428,7 +427,7 @@
# We call an additional extract-modulated without resetting any variables so
# a complete unpacked set goes to the global dir for packaging (like gspec)
-extract: checksum $(COOKIEDIR) pre-extract $(if
$(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix
extract-,$(MODULATIONS)) post-extract
+extract: checksum $(COOKIEDIR) $(if $(NOGITPATCH),,pre-extract-git-check)
extract-modulated $(addprefix extract-,$(MODULATIONS))
@$(DONADA)
extract-global: $(if $(filter global,$(MODULATION)),extract-modulated)
@@ -438,7 +437,7 @@
extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \
$(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \
announce-modulation \
- pre-extract-modulated pre-extract-$(MODULATION)
$(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \
+ $(if $(filter-out global,$(MODULATION)),pre-extract)
pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS)
post-extract-$(MODULATION) post-extract-modulated $(if $(filter-out
global,$(MODULATION)),post-extract) \
$(if $(filter global,$(MODULATION)),,$(if
$(NOGITPATCH),,post-extract-gitsnap)) \
$(foreach FILE,$(EXPANDVARS),expandvars-$(FILE)) \
$(foreach REINPLACEMENT,$(POSTEXTRACT_REINPLACEMENTS),\
@@ -510,10 +509,10 @@
# patch - Apply any provided patches to the source.
PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES)
$(PATCHFILES_$(MODULATION)))
-patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch
+patch: $(addprefix patch-,$(MODULATIONS))
@$(DONADA)
-patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated
pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter
global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap))
post-patch-$(MODULATION) post-patch-modulated
+patch-modulated: extract-modulated $(WORKSRC) pre-patch pre-patch-modulated
pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter
global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap))
post-patch-$(MODULATION) post-patch-modulated post-patch
@$(DONADA)
# returns true if patch has completed successfully, false
@@ -605,12 +604,12 @@
#CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix
/$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS)))
endif
-configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure
+configure: $(addprefix configure-,$(MODULATIONS))
@$(DONADA)
configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS)
$(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \
$(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \
- pre-configure-modulated pre-configure-$(MODULATION)
$(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if
$(STRIP_LIBTOOL),strip-libtool)
+ pre-configure pre-configure-modulated
pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION)
post-configure-modulated post-configure $(if $(STRIP_LIBTOOL),strip-libtool)
@$(DONADA)
strip-libtool:
@@ -626,7 +625,7 @@
@rm -f $(COOKIEDIR)/configure
reset-configure-modulated:
- @rm -f $(foreach C,pre-configure-modulated configure-modulated
post-configure-modulated,$(COOKIEDIR)/$C)
+ @rm -f $(foreach C,pre-configure pre-configure-modulated
configure-modulated post-configure-modulated post-configure,$(COOKIEDIR)/$C)
@rm -f $(COOKIEDIR)/pre-configure-$(MODULATION)
$(COOKIEDIR)/post-configure-$(MODULATION)
@rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS))
@@ -638,7 +637,7 @@
# build - Actually compile the sources.
BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix
build-,$(BUILD_SCRIPTS))
-build: pre-build $(addprefix build-,$(MODULATIONS)) post-build
+build: $(addprefix build-,$(MODULATIONS))
$(DONADA)
# Build for a specific architecture
@@ -647,7 +646,7 @@
$(error Code for the architecture $* can not be produced with
the compiler $(GARCOMPILER)) \
)
-build-modulated: verify-isa configure-modulated pre-build-modulated
pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION)
post-build-modulated
+build-modulated: verify-isa configure-modulated pre-build pre-build-modulated
pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION)
post-build-modulated post-build
@$(MAKECOOKIE)
.PHONY: reset-build reset-build-modulated
@@ -656,9 +655,8 @@
reset-build: $(addprefix reset-build-,$(MODULATIONS))
rm -f $(COOKIEDIR)/build
-# XXX: pre-*, post-*
reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS))
- rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS)
post-build-modulated))
+ rm -f $(addprefix $(COOKIEDIR)/,pre-build pre-build-modulated
$(BUILD_TAGRETS) post-build-modulated post-build))
# returns true if build has completed successfully, false
# otherwise
@@ -667,10 +665,10 @@
TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS))
-test: pre-test $(addprefix test-,$(MODULATIONS)) post-test
+test: $(addprefix test-,$(MODULATIONS))
$(DONADA)
-test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION)
$(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated
+test-modulated: build-modulated pre-test pre-test-modulated
pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION)
post-test-modulated post-test
$(DONADA)
# XXX: retest
@@ -704,13 +702,13 @@
# install - Test and install the results of a build.
INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS))
-install: pre-install $(addprefix install-,$(MODULATIONS)) post-install
+install: $(addprefix install-,$(MODULATIONS))
$(DONADA)
install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS))
test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) \
- pre-install-modulated pre-install-$(MODULATION) \
+ pre-install pre-install-modulated pre-install-$(MODULATION) \
$(INSTALL_TARGETS) \
- post-install-$(MODULATION) post-install-modulated \
+ post-install-$(MODULATION) post-install-modulated post-install \
$(POST_INSTALL_TARGETS) \
$(foreach REINPLACEMENT,$(POSTINSTALL_REINPLACEMENTS),\
post-install-reinplace-$(REINPLACEMENT) \
@@ -741,7 +739,7 @@
reset-install-modulated:
@$(call _pmod,Reset install state)
@rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work
- @rm -f $(foreach C,pre-install-modulated install-modulated
post-install-modulated,$(COOKIEDIR)/$C)
+ @rm -f $(foreach C,pre-install pre-install-modulated install-modulated
post-install-modulated post-install,$(COOKIEDIR)/$C)
@rm -f $(COOKIEDIR)/pre-install-$(MODULATION)
$(COOKIEDIR)/post-install-$(MODULATION)
@rm -f $(COOKIEDIR)/strip
@rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S)
@@ -878,7 +876,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) merge-distfile-README.CSW
merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod)
$(if $(PHP5_EXT),post-merge-php5ext) post-merge
+merge: checksum merge-do merge-license merge-classutils
merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp)
$(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW
merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod)
$(if $(PHP5_EXT),post-merge-php5ext)
@banner merge
@$(MAKECOOKIE)
@@ -920,7 +918,7 @@
@$(MAKECOOKIE)
# This merges the
-merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION)
$(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
+merge-modulated: install-modulated pre-merge pre-merge-modulated
pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION)
post-merge-modulated post-merge
@$(MAKECOOKIE)
# Copy the whole tree verbatim
@@ -968,13 +966,12 @@
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-distfile-README.CSW
reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod
reset-merge-php5ext reset-merge-src
- rm -f $(COOKIEDIR)/pre-merge $(foreach
M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge
$(COOKIEDIR)/post-merge
+ rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M)
$(COOKIEDIR)/merge
rm -rf $(PKGROOT)
reset-merge-modulated:
@$(call _pmod,Reset merge state)
- echo rm -f $(COOKIEDIR)/merge-*
- rm -f $(COOKIEDIR)/merge-*
+ rm -f $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-*
$(COOKIEDIR)/post-merge-*
# The clean rule. It must be run if you want to re-download a
# file after a successful checksum (or just remove the checksum
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
