SF.net SVN: gar:[25886] csw/mgar/pkg/samba/branches/samba4/Makefile
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Thu Aug 18 14:07:48 CEST 2016
Revision: 25886
http://sourceforge.net/p/gar/code/25886
Author: slowfranklin
Date: 2016-08-18 12:07:48 +0000 (Thu, 18 Aug 2016)
Log Message:
-----------
samba/branches/samba4: Remove -B direct and adjust overrides
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba4/Makefile
Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-08-18 07:24:41 UTC (rev 25885)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-08-18 12:07:48 UTC (rev 25886)
@@ -154,14 +154,10 @@
# Silence conflicts with CSWsamba
CHECKPKG_OVERRIDES_CSWsamba4 += file-collision
CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture
-CHECKPKG_OVERRIDES_CSWsamba4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/mit_samba.so|soname=mit_samba.so|pkgname=CSWsamba4|expected=CSWmit-samba
-CHECKPKG_OVERRIDES_CSWsamba4 += soname-equals-filename|file=/opt/csw/lib/mit_samba.so
-CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWperl
CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpython27
CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-python
CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWpy-dnspython
-CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-winbind
#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused
#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0
#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0
@@ -206,7 +202,6 @@
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/nmblookup|CSWsamba|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbrestore|CSWsamba|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/sharesec.1|CSWsamba|CSWsamba4-client
-CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbta-util|CSWsamba|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbtool|CSWsamba|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/rpcclient|CSWsamba-client|CSWsamba4-client
CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbpasswd|CSWsamba|CSWsamba4-client
@@ -238,12 +233,10 @@
RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4
RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-libs
RUNTIME_DEP_PKGS_CSWsamba4-dev += $(RUNTIME_DEP_PKGS_CSWsamba4-dev_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libnetapi.so|CSWsamba-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/libsmbclient.h|CSWsamba-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev
-CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libsmbclient.so|CSWsamba-dev|CSWsamba4-dev
CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libwbclient.so|CSWsamba-dev|CSWsamba4-dev
@@ -291,30 +284,25 @@
#Needs splits:
-CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-atsvc.so.0.0.1|soname=libdcerpc-atsvc.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-atsvc0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-binding.so.0.0.1|soname=libdcerpc-binding.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-binding0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-samr.so.0.0.1|soname=libdcerpc-samr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-samr0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc-server.so.0.0.1|soname=libdcerpc-server.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc-server0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdcerpc.so.0.0.1|soname=libdcerpc.so.0|pkgname=CSWsamba4-libs|expected=CSWlibdcerpc0
-CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgensec.so.0.0.1|soname=libgensec.so.0|pkgname=CSWsamba4-libs|expected=CSWlibgensec0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-krb5pac.so.0.0.1|soname=libndr-krb5pac.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-krb5pac0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-nbt.so.0.0.1|soname=libndr-nbt.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-nbt0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-standard.so.0.0.1|soname=libndr-standard.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-standard0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr.so.0.0.5|soname=libndr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnetapi.so.0|soname=libnetapi.so.0|pkgname=CSWsamba4-libs|expected=CSWlibnetapi0
-CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libregistry.so.0.0.1|soname=libregistry.so.0|pkgname=CSWsamba4-libs|expected=CSWlibregistry0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-credentials.so.0.0.1|soname=libsamba-credentials.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-credentials0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-hostconfig.so.0.0.1|soname=libsamba-hostconfig.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-hostconfig0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.25.0|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-policy.so.0.0.1|soname=libsamba-policy.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-policy0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-util.so.0.0.1|soname=libsamba-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-util0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamdb.so.0.0.1|soname=libsamdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamdb0
-CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbclient-raw.so.0.0.1|soname=libsmbclient-raw.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbclient-raw0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbclient.so.0.2.3|soname=libsmbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbclient0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbconf.so.0|soname=libsmbconf.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbconf0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbldap.so.0|soname=libsmbldap.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbldap0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-util.so.0.0.1|soname=libtevent-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-util0
-CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtorture.so.0.0.1|soname=libtorture.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtorture0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwbclient.so.0.12|soname=libwbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibwbclient0
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-errors.so.1|soname=libsamba-errors.so.1|pkgname=CSWsamba4-libs|expected=CSWlibsamba-errors1
CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-unix-util.so.0.0.1|soname=libtevent-unix-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-unix-util0
@@ -340,11 +328,8 @@
RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GARCH)_$(GAROSREL))
#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused
CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py
-CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py
CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/netcmd/domain.py
-CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/external/testtools/tests/test_compat.py
CHECKPKG_OVERRIDES_CSWsamba4-python += pkgname-does-not-start-with-CSWpy-
-CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-found|libsamba-passdb.so.0|is|needed|by|opt/csw/lib/python2.7/site-packages/samba/samba3/passdb.so
CHECKPKG_OVERRIDES_CSWsamba4-python += catalogname-does-not-start-with-py_
CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-part-of-filename
#needs some fix
@@ -448,8 +433,6 @@
RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4-winbind
CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file
CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_winbind_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links
-CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_smbpass_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links
-CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4-winbind
CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4
CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL))
CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4
@@ -466,12 +449,12 @@
# The build fails to add the right rpath to at least the public libs
#EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
-EXTRA_LD_OPTIONS = -Bdirect -z ignore -z nolazyload
+EXTRA_LD_OPTIONS = -z nolazyload
#EXTRA_CFLAGS += -lrt -lintl -lsec
#EXTRA_LDFLAGS += -lrt -lintl -lsec
EXTRA_LDFLAGS += -lintl
-EXTRA_LDFLAGS += -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
+EXTRA_LDFLAGS += -R$(SMBPRIVATELIB)
# 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.
More information about the devel
mailing list