summaryrefslogtreecommitdiff
path: root/net/samba
diff options
context:
space:
mode:
authorrin <rin@pkgsrc.org>2022-06-27 20:59:39 +0000
committerrin <rin@pkgsrc.org>2022-06-27 20:59:39 +0000
commit40b398f2f7065d533625168e678763dfe602e472 (patch)
tree5828b215ccae6a862c5cddd393be659daa254ec2 /net/samba
parentfef5dce1aa8a2046bf0f63d5d0ebce7249010a96 (diff)
downloadpkgsrc-40b398f2f7065d533625168e678763dfe602e472.tar.gz
net/samba{,4}: Restrict ``disabling PIE hack'' for NetBSD/powerpc
prior to 9.0. ld.elf_so(1) for 9.0 and later support R_PPC_ADDR16_HA (== 6) and friends: http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c#rev1.58.2.1 Bump revision. Close PR pkg/38961.
Diffstat (limited to 'net/samba')
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba/hacks.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index d716ff72e04..f2c93c9bcc8 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2021/12/08 16:06:07 adam Exp $
+# $NetBSD: Makefile,v 1.292 2022/06/27 20:59:39 rin Exp $
DISTNAME= samba-${VERSION}
CATEGORIES= net
@@ -10,7 +10,7 @@ COMMENT= SMB/CIFS protocol server suite
LICENSE= gnu-gpl-v3
VERSION= 3.6.25
-PKGREVISION= 31
+PKGREVISION= 32
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
diff --git a/net/samba/hacks.mk b/net/samba/hacks.mk
index f72242a513f..e4f38831d30 100644
--- a/net/samba/hacks.mk
+++ b/net/samba/hacks.mk
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $
+# $NetBSD: hacks.mk,v 1.2 2022/06/27 20:59:39 rin Exp $
# Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
-# relocations' error under NetBSD/macppc.
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+# relocations' error under NetBSD/powerpc < 9.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc)
PKG_HACKS+= pie
CONFIGURE_ARGS+= --disable-pie
.endif