CVS commit: pkgsrc/archivers/zip

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep 30 11:39:27 UTC 2021

Modified Files:
        pkgsrc/archivers/zip: Makefile
Added Files:
        pkgsrc/archivers/zip: hacks.mk

Log Message:
zip: Support MKPIE on i386. Move compiler bug hacks to hacks.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/archivers/zip/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/zip/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/zip/Makefile
diff -u pkgsrc/archivers/zip/Makefile:1.64 pkgsrc/archivers/zip/Makefile:1.65
--- pkgsrc/archivers/zip/Makefile:1.64  Fri Aug 28 08:17:38 2015
+++ pkgsrc/archivers/zip/Makefile       Thu Sep 30 11:39:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/08/28 08:17:38 richard Exp $
+# $NetBSD: Makefile,v 1.65 2021/09/30 11:39:27 nia Exp $
 
 DISTNAME=      zip30
 PKGNAME=       zip-3.0
@@ -19,9 +19,6 @@ MAKE_FILE=    unix/Makefile
 MAKE_FLAGS+=   LOCAL_ZIP=${CFLAGS:Q}
 MAKE_FLAGS+=   LFLAGS1=${_STRIPFLAG_CC:Q}
 MAKE_FLAGS+=   -DUNICODE_SUPPORT
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
-CFLAGS+=       -O0
-.endif
 
 .include "../../mk/compiler.mk"
 
@@ -32,6 +29,11 @@ BUILD_TARGET=        generic
 CFLAGS+=       -O
 .endif
 
+.if ${MACHINE_ARCH} == "i386" && ${PKGSRC_MKPIE:tl} != "no"
+# Text relocations
+MAKE_FLAGS+=   DISABLE_ASM=YES
+.endif
+
 .if !empty(PKGSRC_COMPILER:Msunpro)
 MAKE_FLAGS+=   DISABLE_ASM=YES
 .endif

Added files:

Index: pkgsrc/archivers/zip/hacks.mk
diff -u /dev/null pkgsrc/archivers/zip/hacks.mk:1.1
--- /dev/null   Thu Sep 30 11:39:27 2021
+++ pkgsrc/archivers/zip/hacks.mk       Thu Sep 30 11:39:27 2021
@@ -0,0 +1,14 @@
+# $NetBSD: hacks.mk,v 1.1 2021/09/30 11:39:27 nia Exp $
+
+.if !defined(ZIP_HACKS_MK)
+ZIP_HACKS_MK=  # defined
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+PKG_HACKS+=    disable-opt
+
+# This was added in 2003 to work around a compiler bug...
+# is it still even required?
+CFLAGS+=       -O0
+.endif
+
+.endif # ZIP_HACKS_MK