SF.net SVN: gar:[23557] csw/mgar/pkg/glib2/trunk/Makefile

slowfranklin at users.sourceforge.net slowfranklin at users.sourceforge.net
Tue May 6 11:21:10 CEST 2014 

Revision: 23557
          http://sourceforge.net/p/gar/code/23557
Author:   slowfranklin
Date:     2014-05-06 09:21:06 +0000 (Tue, 06 May 2014)
Log Message:
-----------
glib2/trunk: Update dependencies and overrides

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

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2014-05-05 14:15:15 UTC (rev 23556)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2014-05-06 09:21:06 UTC (rev 23557)
@@ -117,11 +117,7 @@
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWglib2 += CSWpython
-CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend
-CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgio2-0-0
-CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8
 CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyo
 CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/parser.pyc
 CHECKPKG_OVERRIDES_CSWglib2 += discouraged-path-in-pkgmap|/opt/csw/share/glib-2.0/codegen/utils.pyc
@@ -147,6 +143,13 @@
 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWgio-fam-backend_5.10_sparc += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWgio-fam-backend += $(RUNTIME_DEP_PKGS_CSWgio-fam-backend_$(GAROSREL)_$(GARCH))
 
 PACKAGES += CSWlibgio2-0-0
 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0
@@ -158,15 +161,19 @@
 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo
 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgio2-0-0_5.10_sparc += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgio2-0-0_$(GAROSREL)_$(GARCH))
 # Those are ok: hardcoded search paths which have added /opt/csw
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3600.3
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.4000.0
 # libgio uses the mime info for determining the type of files
 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.4000.0
 CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH))
 
 
@@ -177,12 +184,12 @@
 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3600.3
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0
 # checkpkg doesn't take the solaris version into account and that this symbol version is okay to be used in solaris 11
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GAROSREL))
 
 
@@ -191,27 +198,39 @@
 SPKG_DESC_CSWlibgmodule2-0-0 += $(DESCRIPTION), libgmodule-2.0.so.0
 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_5.10_sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0_$(GAROSREL)_$(GARCH))
 # Those are ok: hardcoded search paths which have added /opt/csw
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3600.3
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0
 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GARCH))
 
 PACKAGES += CSWlibgobject2-0-0
 PKGFILES_CSWlibgobject2-0-0 += $(call pkgfiles_lib,libgobject-2.0.so.0)
 SPKG_DESC_CSWlibgobject2-0-0 += $(DESCRIPTION), libgobject-2.0.so.0
 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi4
 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_5.10_sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgobject2-0-0_$(GAROSREL)_$(GARCH))
 
 PACKAGES += CSWlibgthread2-0-0
 SPKG_DESC_CSWlibgthread2-0-0 += $(DESCRIPTION), libgthread-2.0.so.0
 PKGFILES_CSWlibgthread2-0-0 += $(call pkgfiles_lib,libgthread-2.0.so.0)
 RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_5.10_sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += $(RUNTIME_DEP_PKGS_CSWlibgthread2-0-0_$(GAROSREL)_$(GARCH))
 
 PACKAGES += CSWlibglib2-dev
 SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread

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