CVS commit: pkgsrc/audio/flac

["Nia Alarie" <nia%netbsd.org@localhost>]

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.

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)