pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/samba4 FIx build on 32-bit architecture environments.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7b6734a9209f
branches: trunk
changeset: 326520:7b6734a9209f
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun Dec 09 14:48:03 2018 +0000
description:
FIx build on 32-bit architecture environments.
ldb-lmdb part is not buildable for 32-bit architecture environments.
Tested on NetBSD/i386 8.
diffstat:
net/samba4/Makefile | 14 ++++++++++++--
net/samba4/PLIST | 6 +++---
2 files changed, 15 insertions(+), 5 deletions(-)
diffs (62 lines):
diff -r 19a647604dfc -r 7b6734a9209f net/samba4/Makefile
--- a/net/samba4/Makefile Sun Dec 09 12:23:22 2018 +0000
+++ b/net/samba4/Makefile Sun Dec 09 14:48:03 2018 +0000
@@ -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 @@
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 @@
${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/* \
diff -r 19a647604dfc -r 7b6734a9209f net/samba4/PLIST
--- a/net/samba4/PLIST Sun Dec 09 12:23:22 2018 +0000
+++ b/net/samba4/PLIST Sun Dec 09 14:48:03 2018 +0000
@@ -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/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/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
Home |
Main Index |
Thread Index |
Old Index