[csw-devel] SF.net SVN: gar:[21144] csw/mgar/pkg/glib2/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 21144
          http://gar.svn.sourceforge.net/gar/?rev=21144&view=rev
Author:   lblume
Date:     2013-05-19 14:49:34 +0000 (Sun, 19 May 2013)
Log Message:
-----------
glib2/trunk: Typo in one override, make some others arch-specific; fix PATH so python is found

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2013-05-19 14:01:06 UTC (rev 21143)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2013-05-19 14:49:34 UTC (rev 21144)
@@ -171,7 +171,7 @@
 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython
 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend
-CHECKPKG_OVERRIDES_CSWCSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend
+CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend
 PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.*
 PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.*
@@ -206,22 +206,39 @@
 CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/parser.pyo
 CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyc
 CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/utils.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/__init__.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_docbook.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/codegen_main.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/config.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/dbustypes.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/parser.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_sparc += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/gdbus-2.0/codegen/utils.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyc
+CHECKPKG_OVERRIDES_CSWlibglib2-dev_i386 += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyo
+CHECKPKG_OVERRIDES_CSWlibglib2-dev += $(CHECKPKG_OVERRIDES_CSWlibglib2-dev_$(GARCH))
 
 PACKAGES += CSWglib2-doc
 ARCHALL_CSWglib2-doc = 1
@@ -289,7 +306,9 @@
 include gar/category.mk
 
 # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out
-PATH := /opt/csw/gnu:$(PATH)
+# IT seems that the correct Python is not picked up during make check on x86
+# without putting /opt/csw/bin first in PATH
+PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
 
 post-merge:
 	@echo "=== Cleanup stray bash_completion.d ==="

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