CVS commit: pkgsrc/net/samba4

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Dec  9 14:48:03 UTC 2018

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST

Log Message:
FIx build on 32-bit architecture environments.

ldb-lmdb part is not buildable for 32-bit architecture environments.
Tested on NetBSD/i386 8.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/samba4/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.53 pkgsrc/net/samba4/Makefile:1.54
--- pkgsrc/net/samba4/Makefile:1.53     Mon Dec  3 13:51:52 2018
+++ pkgsrc/net/samba4/Makefile  Sun Dec  9 14:48:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/12/03 13:51:52 mlelstv Exp $
+# $NetBSD: Makefile,v 1.54 2018/12/09 14:48:03 ryoon Exp $
 
 DISTNAME=      samba-${VERSION}
 PKGREVISION=   1
@@ -138,6 +138,16 @@ MAKEFLAGS+=        PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=  MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=  PWD_MKDB=${PWD_MKDB:Q}
 
+PLIST_VARS+=   64bit
+.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
+       (defined(ABI) && ${ABI} == "64")
+CONFIGURE_ARGS+=       --with-ldb-lmdb
+PLIST.64bit=           yes
+.else
+CONFIGURE_ARGS+=       --without-ldb-lmdb
+PLIST.64bit=           no
+.endif
+
 INSTALLATION_DIRS+=    ${DOCDIR} ${EGDIR}
 
 DOCDIR=                share/doc/${PKGBASE}
@@ -184,7 +194,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
                ${DESTDIR}${PREFIX}/${EGDIR}
 
-REPLACE_PERL=  pidl/pidl
+REPLACE_PERL+= pidl/pidl
 REPLACE_PYTHON=        buildtools/bin/waf \
                source4/setup/* \
                source4/scripting/bin/* \

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.15 pkgsrc/net/samba4/PLIST:1.16
--- pkgsrc/net/samba4/PLIST:1.15        Mon Dec  3 13:51:52 2018
+++ pkgsrc/net/samba4/PLIST     Sun Dec  9 14:48:03 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2018/12/03 13:51:52 mlelstv Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/12/09 14:48:03 ryoon Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/findsmb
@@ -560,7 +560,7 @@ lib/samba/ldb/ldb.so
 lib/samba/ldb/ldbsamba_extensions.so
 lib/samba/ldb/linked_attributes.so
 lib/samba/ldb/local_password.so
-lib/samba/ldb/mdb.so
+${PLIST.64bit}lib/samba/ldb/mdb.so
 lib/samba/ldb/new_partition.so
 lib/samba/ldb/objectclass.so
 lib/samba/ldb/objectclass_attrs.so
@@ -667,7 +667,7 @@ lib/samba/private/libkrb5-samba4.so.26.0
 lib/samba/private/libkrb5samba-samba4.so
 lib/samba/private/libldb-cmdline-samba4.so
 lib/samba/private/libldb-key-value-samba4.so
-lib/samba/private/libldb-mdb-int-samba4.so
+${PLIST.64-bit}lib/samba/private/libldb-mdb-int-samba4.so
 lib/samba/private/libldb.so.1
 lib/samba/private/libldb.so.1.4.3
 lib/samba/private/libldbsamba-samba4.so