SF.net SVN: gar:[25383] csw/mgar/pkg/samba/branches/samba4/Makefile

janholzh at users.sourceforge.net janholzh at users.sourceforge.net
Wed Nov 18 11:49:13 CET 2015 

Revision: 25383
          http://sourceforge.net/p/gar/code/25383
Author:   janholzh
Date:     2015-11-18 10:49:12 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
samba/branches/samba4: fix cyclic dependency I hope

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba4/Makefile

Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile	2015-11-18 09:14:44 UTC (rev 25382)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2015-11-18 10:49:12 UTC (rev 25383)
@@ -348,9 +348,9 @@
 SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL))
@@ -374,7 +374,6 @@
 PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibssp0
@@ -387,6 +386,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0
@@ -403,7 +403,6 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0
@@ -412,6 +411,7 @@
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0
@@ -427,7 +427,6 @@
 SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0
@@ -436,6 +435,7 @@
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused
 #CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs
@@ -452,7 +452,6 @@
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr-standard0
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL))
 
 PACKAGES += CSWlibndr-nbt0
@@ -462,7 +461,6 @@
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL))
@@ -476,7 +474,6 @@
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWsamba4-libs
 
 PACKAGES += CSWlibndr0
 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1)
@@ -487,7 +484,6 @@
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL))
 
 PACKAGES += CSWlibnetapi0
@@ -504,7 +500,6 @@
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0
 #RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused
@@ -557,7 +552,6 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused
@@ -567,7 +561,6 @@
 PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0\.0\.1)
 PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsamba-passdb0 += $(DESCRIPTION), libsamba-passdb.so.0
-RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-credentials0
@@ -577,6 +570,9 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibtdb1
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibwbclient0
 
 PACKAGES += CSWlibsamba-hostconfig0
 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1)
@@ -585,7 +581,6 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL))
 
@@ -614,9 +609,9 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL))
 
 PACKAGES += CSWlibsamdb0
@@ -630,7 +625,6 @@
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused
@@ -643,13 +637,13 @@
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused
@@ -664,7 +658,6 @@
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr-standard0
@@ -674,6 +667,7 @@
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused
 #CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0
@@ -688,11 +682,11 @@
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibssp0
-RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused
 #CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0
@@ -705,8 +699,8 @@
 SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0
 #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused
 #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0
 #CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs
@@ -909,7 +903,27 @@
 CHECKPKG_OVERRIDES_CSWlibtorture0 += surplus-dependency|CSWlibintl8
 CHECKPKG_OVERRIDES_CSWlibndr0 += surplus-dependency|CSWlibintl8
 
+#Otherwise we get  cyclic dependency
+CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsamba-util0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibtevent-util0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibgensec0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsmbldap0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsamdb0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsamba-passdb0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibsmbconf0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibnetapi0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibdcerpc0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibndr-standard0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibndr0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += missing-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWsamba4-libs
 
+
 # For checking whether we're missing anything, enable and check when updating.
 # Should only catch SWAT stuff which is EOL upstream so we're not packaging it
 # PACKAGES += CSWsamba4-catchall

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