CVS commit: pkgsrc/archivers/7-zip

This is a multi-part message in MIME format.

--_----------=_1785879587285430
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Aug  4 21:39:47 UTC 2026

Modified Files:
	pkgsrc/archivers/7-zip: Makefile

Log Message:
7-zip: honor LDFLAGS

Remove hack.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/archivers/7-zip/Makefile

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


--_----------=_1785879587285430
Content-Disposition: inline
Content-Length: 1174
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/archivers/7-zip/Makefile
diff -u pkgsrc/archivers/7-zip/Makefile:1.14 pkgsrc/archivers/7-zip/Makefile:1.15
--- pkgsrc/archivers/7-zip/Makefile:1.14	Tue Aug  4 20:28:42 2026
+++ pkgsrc/archivers/7-zip/Makefile	Tue Aug  4 21:39:47 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2026/08/04 20:28:42 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/08/04 21:39:47 wiz Exp $
 
 DISTNAME=	7z2602-src
 PKGNAME=	7-zip-26.02
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://7-zip.org/a/
 EXTRACT_SUFX=	.tar.xz
@@ -20,6 +21,8 @@ MAKE_FILE=	makefile.gcc
 
 # Disable -Werror.
 MAKE_FLAGS+=	CFLAGS_WARN_WALL=${CFLAGS:Q}
+# pass in LDFLAGS
+MAKE_FLAGS+=	MY_LIBS=${LDFLAGS:Q}
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
@@ -47,10 +50,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/CPP/7zip/Bundles/Alone2/_o/7zz \
 		${DESTDIR}${PREFIX}/bin
 
-# FIXME: replace by proper LDFLAGS handling
-_WRAP_EXTRA_ARGS.CC+=	${_RELRO_LDFLAGS}
-_WRAP_EXTRA_ARGS.CXX+=	${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cc+=	${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cxx+=	${_RELRO_LDFLAGS}
-
 .include "../../mk/bsd.pkg.mk"


--_----------=_1785879587285430--