git: 95c89d246afb - main - archivers/upx: Fix build on 14-CURRENT

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 02 May 2023 20:02:12 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=95c89d246afb6e04e61ed416574ef8d79a386683

commit 95c89d246afb6e04e61ed416574ef8d79a386683
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-05-02 19:58:20 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-05-02 19:58:20 +0000

    archivers/upx: Fix build on 14-CURRENT
    
    In file included from filteri.cpp:71:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:73:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:79:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:81:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:87:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:89:
    ./filter/cto.h:47:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:100:
    ./filter/ctoj.h:51:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:102:
    ./filter/ctoj.h:51:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:115:
    ./filter/ctok.h:52:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:117:
    ./filter/ctok.h:52:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:141:
    ./filter/ctojr.h:109:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    In file included from filteri.cpp:143:
    ./filter/ctojr.h:109:39: error: variable 'noncalls2' set but not used [-Werror,-Wunused-but-set-variable]
        unsigned calls = 0, noncalls = 0, noncalls2 = 0;
                                          ^
    12 errors generated.
    
    Reference:      https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/pdf5b273c8e36_s83d5725005/logs/upx-3.96.log
---
 archivers/upx/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 2ea930b4067e..3a101bfd2bed 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -24,8 +24,14 @@ PLIST_FILES=	bin/upx \
 
 CPE_VENDOR=	upx_project
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=       -Wno-error=unused-but-set-variable
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
 	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>