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

[janholzh at users.sourceforge.net]

Revision: 25247
          http://sourceforge.net/p/gar/code/25247
Author:   janholzh
Date:     2015-09-22 16:34:38 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
samba/branches/samba4: wip 4.3.0 fix deps and lib packages

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-09-21 14:18:55 UTC (rev 25246)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2015-09-22 16:34:38 UTC (rev 25247)
@@ -434,7 +434,6 @@
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL))
@@ -496,6 +495,7 @@
 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-credentials0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-passdb0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
@@ -777,9 +777,9 @@
 INCOMPATIBLE_PKGS_CSWsamba4-winbind += CSWsamba-nss CSWsamba-winbind
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(bindir),wbinfo)
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so)
-PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1)
+#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1)
 #PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,libnss_wins.so.2)
-PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,winbind_krb5_locator.so)
+#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,winbind_krb5_locator.so)
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd)
 PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo
 PKGFILES_CSWsamba4-winbind += $(mandir)/man5/pam_winbind\.conf\.5
@@ -807,6 +807,8 @@
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibdcerpc-binding0
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWnss-winbind1
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWwinbind-krb5locator
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL))
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision
@@ -819,6 +821,29 @@
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += $(CHECKPKG_OVERRIDES_CSWsamba4-winbind_$(GAROSREL))
 
+
+PACKAGES += CSWnss-winbind1
+CATALOGNAME_CSWnss-winbind1 = nss_winbind1
+PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1)
+PKGFILES_CSWnss-winbind1 += $(call baseisadirs,$(libdir),nss_winbind\.so\.1(\.\d+)*)
+SPKG_DESC_CSWnss-winbind1 += $(DESCRIPTION), nss_winbind.so.1
+RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss
+
+
+PACKAGES += CSWwinbind-krb5locator
+CATALOGNAME_CSWwinbind-krb5locator = winbind_krb5locator
+PKGFILES_CSWwinbind-krb5locator += $(call baseisadirs,$(libdir),winbind_krb5_locator\.so)
+PKGFILES_CSWwinbind-krb5locator += $(call baseisadirs,$(libdir),winbind_krb5_locator\.so(\.\d+)*)
+SPKG_DESC_CSWwinbind-krb5locator += $(DESCRIPTION), winbind_krb5_locator.so
+RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so
+
 PACKAGES += CSWsamba4-nss-system-links
 ARCHALL_CSWsamba4-nss-system-links = 1
 CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links
@@ -828,6 +853,7 @@
 PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1
 SPKG_DESC_CSWsamba4-nss-system-links += Samba 4 nss modules links for the system
 RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind
+RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWnss-winbind1
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += surplus-dependency|CSWsamba4-winbind
@@ -862,11 +888,13 @@
 RUNTIME_DEP_PKGS_CSWsamba4-catchall += CSWlibpopt0
 
 # The build fails to add the right rpath to at least the public libs
-EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
+#EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
 EXTRA_LD_OPTIONS = -Bdirect -z ignore -z nolazyload
 
-EXTRA_CFLAGS += -lrt -lintl -lsec 
-EXTRA_LDFLAGS += -lrt -lintl -lsec 
+#EXTRA_CFLAGS += -lrt -lintl -lsec 
+#EXTRA_LDFLAGS += -lrt -lintl -lsec 
+EXTRA_LDFLAGS += -lintl 
+EXTRA_LDFLAGS += -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
 
 
 # At the moment there are errors about python headers missing on 64 bit

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