[csw-devel] SF.net SVN: gar:[21137] csw/mgar/pkg/glib2/trunk/Makefile
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Sat May 18 11:18:30 CEST 2013
Revision: 21137
http://gar.svn.sourceforge.net/gar/?rev=21137&view=rev
Author: lblume
Date: 2013-05-18 09:18:21 +0000 (Sat, 18 May 2013)
Log Message:
-----------
glib2/trunk: Remove unused dependencies and do some cleanup in the overrides
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-17 22:02:15 UTC (rev 21136)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-18 09:18:21 UTC (rev 21137)
@@ -92,113 +92,85 @@
PACKAGES += CSWglib2
SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend
RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi4
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0
CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend
+CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWlibgthread2-0-0
-
PACKAGES += CSWgio-fam-backend
SPKG_DESC_CSWgio-fam-backend = $(DESCRIPTION), GIO FAM backend
PKGFILES_CSWgio-fam-backend = .*/libgiofam.so
RUNTIME_DEP_PKGS_CSWgio-fam-backend = CSWlibfam0
RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibffi4
PACKAGES += CSWlibgio2-0-0
SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0
PKGFILES_CSWlibgio2-0-0 += $(call pkgfiles_lib,libgio-2.0.so.0)
-RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibz1
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo
-RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibffi4
# 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.3200.4
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4
CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgio-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibgio2-0-0_$(GARCH))
+
PACKAGES += CSWlibglib2-0-0
PKGFILES_CSWlibglib2-0-0 += $(call pkgfiles_lib,libglib-2.0.so.0)
SPKG_DESC_CSWlibglib2-0-0 += $(DESCRIPTION), libglib-2.0.so.0
RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibpcre1
-# 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.3200.4
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4
PACKAGES += CSWlibgmodule2-0-0
PKGFILES_CSWlibgmodule2-0-0 += $(call pkgfiles_lib,libgmodule-2.0.so.0)
SPKG_DESC_CSWlibgmodule2-0-0 += $(DESCRIPTION), libgmodule-2.0.so.0
-RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgmodule2-0-0 += CSWlibpcre1
+# 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.3200.4
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libglib-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.3200.4
+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 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibpcre1
RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi4
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 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthread2-0-0 += CSWlibpcre1
PACKAGES += CSWlibglib2-dev
SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWzlib
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi4
-RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibz1
PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.*
PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.*
@@ -217,25 +189,6 @@
PKGFILES_CSWlibglib2-dev += .*/man1/gtester.*
OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel
CATALOGNAME_CSWglib2devel = glib2_devel_stub
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWglib2
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWiconv
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWzlib
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/__init__.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_docbook.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/codegen_main.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/config.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/dbustypes.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/parser.pyo
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyc
-CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/gdbus-2.0/codegen/utils.pyo
CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyc
CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/__init__.pyo
CHECKPKG_OVERRIDES_CSWlibglib2-dev += discouraged-path-in-pkgmap|/opt/csw/lib/gdbus-2.0/codegen/codegen.pyc
@@ -283,10 +236,6 @@
# This is used to adjust paths in documentation
BUILD_DEP_PKGS += CSWgsed
-# We don't need it and if defined the test breaks
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS =
-
# -xO4 is necessary on sparc so that function inlining happens as expected
EXTRA_CFLAGS_sparc = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
EXTRA_CFLAGS_i386 = -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
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