Received: by mail.netbsd.org (Postfix, from userid 605) id 082A084E57; Sun, 1 Aug 2021 05:07:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4191E84DBD for ; Sun, 1 Aug 2021 05:07:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 3wJsfaxK3fQO for ; Sun, 1 Aug 2021 05:07:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8CCDA84CFD for ; Sun, 1 Aug 2021 05:07:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 80E29FA97; Sun, 1 Aug 2021 05:07:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1627794474184850" MIME-Version: 1.0 Date: Sun, 1 Aug 2021 05:07:54 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio/flac To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210801050754.80E29FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1627794474184850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Aug 1 05:07:54 UTC 2021 Modified Files: pkgsrc/audio/flac: Makefile Log Message: flac: Fix building on i386 with MKPIE. pkg/56339 To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 pkgsrc/audio/flac/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1627794474184850 Content-Disposition: inline Content-Length: 968 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/flac/Makefile diff -u pkgsrc/audio/flac/Makefile:1.55 pkgsrc/audio/flac/Makefile:1.56 --- pkgsrc/audio/flac/Makefile:1.55 Tue Dec 17 13:59:50 2019 +++ pkgsrc/audio/flac/Makefile Sun Aug 1 05:07:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2019/12/17 13:59:50 nros Exp $ +# $NetBSD: Makefile,v 1.56 2021/08/01 05:07:54 nia Exp $ DISTNAME= flac-1.3.3 CATEGORIES= audio archivers @@ -19,10 +19,16 @@ CONFIGURE_ARGS+= --disable-xmms-plugin PKGCONFIG_OVERRIDE+= src/libFLAC++/flac++.pc.in PKGCONFIG_OVERRIDE+= src/libFLAC/flac.pc.in +BUILD_DEFS+= PKGSRC_MKPIE + .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) -BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm +.if ${MACHINE_ARCH} == "i386" +. if ${PKGSRC_MKPIE:tl} == "yes" +CONFIGURE_ARGS+= --disable-asm-optimizations +. else +TOOL_DEPENDS+= nasm>=0.98:../../devel/nasm +. endif .endif .if !empty(MACHINE_PLATFORM:M*-*-powerpc) --_----------=_1627794474184850--