diff options
| author | jmmv <jmmv@pkgsrc.org> | 2010-03-08 22:19:07 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2010-03-08 22:19:07 +0000 |
| commit | a227e90b419351c7d9468908a36f0b5baec73538 (patch) | |
| tree | f06bab2f50ad0cff1542dd42adf725eb08b59212 /net | |
| parent | 82a9ace3a0b98702aa59a991e4c7ef1c3198c832 (diff) | |
| download | pkgsrc-a227e90b419351c7d9468908a36f0b5baec73538.tar.gz | |
Disable PIE on NetBSD/macppc to fix use of unsupported relocation type in.
Samba 3.0 and 3.3. They were completely broken before this.
Bump PKGREVISION for both samba and samba33.
Fix from PR pkg/38961 by Makoto Fujiwara <makoto at ki dot nu>.
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/hacks.mk | 8 | ||||
| -rw-r--r-- | net/samba33/Makefile | 3 | ||||
| -rw-r--r-- | net/samba33/hacks.mk | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index ab9f52d176d..ae675bf80e2 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.197 2010/02/09 16:08:35 drochner Exp $ +# $NetBSD: Makefile,v 1.198 2010/03/08 22:19:07 jmmv Exp $ .include "Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} diff --git a/net/samba/hacks.mk b/net/samba/hacks.mk new file mode 100644 index 00000000000..f72242a513f --- /dev/null +++ b/net/samba/hacks.mk @@ -0,0 +1,8 @@ +# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $ + +# Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT +# relocations' error under NetBSD/macppc. +.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc" +PKG_HACKS+= pie +CONFIGURE_ARGS+= --disable-pie +.endif diff --git a/net/samba33/Makefile b/net/samba33/Makefile index 2c9032ab70d..80951b566de 100644 --- a/net/samba33/Makefile +++ b/net/samba33/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2010/03/02 14:56:22 taca Exp $ +# $NetBSD: Makefile,v 1.5 2010/03/08 22:19:07 jmmv Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} diff --git a/net/samba33/hacks.mk b/net/samba33/hacks.mk new file mode 100644 index 00000000000..35cfae378c8 --- /dev/null +++ b/net/samba33/hacks.mk @@ -0,0 +1,3 @@ +# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $ + +.include "../../net/samba/hacks.mk" |