[csw-devel] SF.net SVN: gar:[10585] csw/mgar/gar

[dmichelsen at users.sourceforge.net]

Revision: 10585
          http://gar.svn.sourceforge.net/gar/?rev=10585&view=rev
Author:   dmichelsen
Date:     2010-07-26 12:09:40 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
mGAR v2: Make new branch for package-internal checkpkg override

Modified Paths:
--------------
    csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk
    csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk

Added Paths:
-----------
    csw/mgar/gar/v2-checkpkg-override-relocation/

Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-07-26 11:07:07 UTC (rev 10584)
+++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk	2010-07-26 12:09:40 UTC (rev 10585)
@@ -31,6 +31,7 @@
 WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work)
 WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION)
 WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))
+WORKDIR_GLOBAL ?= $(WORKROOTDIR)/build-global
 DOWNLOADDIR ?= $(WORKROOTDIR)/download
 PARTIALDIR ?= $(DOWNLOADDIR)/partial
 COOKIEROOTDIR ?= $(WORKROOTDIR)/cookies
@@ -492,7 +493,7 @@
  SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
     GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
     GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-   SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
+   SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath
    SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
  SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
 

Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-07-26 11:07:07 UTC (rev 10584)
+++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk	2010-07-26 12:09:40 UTC (rev 10585)
@@ -366,7 +366,10 @@
 		$$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\
                 print join(" ", at F),"\n";'
 
+_PROTOTYPE_MODIFIERS += | ( cat; \
+		$(foreach SPEC,$(_PKG_SPECS),if test -f "$(WORKDIR_GLOBAL)/checkpkg_override.$(SPEC)";then echo "i checkpkg_override=checkpkg_override.$(SPEC)"; fi;))
 
+
 # This file contains all installed pathes. This can be used as a starting point
 # for distributing files to individual packages.
 PROTOTYPE = $(WORKDIR)/prototype
@@ -682,7 +685,7 @@
 	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides
 	$(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)) $(_CATEGORY_CHECKPKG_OVERRIDES),echo "$O";)) | \
 		perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \
-		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)
+		> $(WORKDIR_GLOBAL)/checkpkg_override.$*
 	@$(MAKECOOKIE)
 
 merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES),$(_CATEGORY_CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))


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