SF.net SVN: gar:[23265] csw/mgar/pkg/samba/branches/samba3/Makefile

lblume at users.sourceforge.net lblume at users.sourceforge.net
Fri Mar 21 20:25:21 CET 2014


Revision: 23265
          http://sourceforge.net/p/gar/code/23265
Author:   lblume
Date:     2014-03-21 19:25:19 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
samba/branches/samba3: Adjust dependencies for S10 and make optional the ld bug workaround

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

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2014-03-21 01:33:28 UTC (rev 23264)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2014-03-21 19:25:19 UTC (rev 23265)
@@ -174,6 +174,7 @@
 RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss
 CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss
 CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += file-needed-but-no-package-satisfies-it
 
 PACKAGES += CSWsamba-pam-system-links
 CATALOGNAME_CSWsamba-pam-system-links = samba_pam_system_links
@@ -189,6 +190,7 @@
 CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += surplus-dependency|CSWsamba
 CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += surplus-dependency|CSWsamba-winbind
 CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWsamba-pam-system-links += file-needed-but-no-package-satisfies-it
 
 PACKAGES += CSWlibtevent0
 CATALOGNAME_CSWlibtevent0 = libtevent0
@@ -306,7 +308,19 @@
 
 CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWsamba-nss
 
+### The dependencies names in S10 are getting simpler
+ifeq ($(shell /usr/bin/uname -r),5.9)
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgssapi-krb5-2
+endif
+###
+
 ### Needed to work around the ld Bug 
+ifeq ($(shell /usr/bin/uname -rp),5.10 sparc)
 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibtdb1 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibwbclient0 += CSWlibintl8
@@ -317,6 +331,7 @@
 RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibintl8
+endif
 ###
 
 # Needed as the configure script doesn't add it

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