CVS commit: pkgsrc/devel/patchelf

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Oct 14 18:38:20 UTC 2024

Modified Files:
        pkgsrc/devel/patchelf: Makefile

Log Message:
devel/patchelf: Require gcc10 for std::optional

This package was marked to require gcc8 because of std::optional.
Change to 10 to align with the limited versions guidance in
mk/compiler/gcc.mk, to avoid building 8 on a typical system which has
had to build 10 anyway.

Add a comment explaining that the mk/compiler/gcc.mk choice of 7 for
c++17 is buggy because declaring c++17 does not lead to a compiler
that can compile c++17 programs, and that there is no carve out for
std::optional.

Builds on n9/i386 and n10/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/patchelf/Makefile

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

Modified files:

Index: pkgsrc/devel/patchelf/Makefile
diff -u pkgsrc/devel/patchelf/Makefile:1.17 pkgsrc/devel/patchelf/Makefile:1.18
--- pkgsrc/devel/patchelf/Makefile:1.17 Mon Aug 28 15:09:32 2023
+++ pkgsrc/devel/patchelf/Makefile      Mon Oct 14 18:38:20 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2023/08/28 15:09:32 fcambus Exp $
+# $NetBSD: Makefile,v 1.18 2024/10/14 18:38:20 gdt Exp $
 
 DISTNAME=      patchelf-0.18.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=NixOS/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -12,8 +13,13 @@ COMMENT=     Modify the dynamic linker and R
 LICENSE=       gnu-gpl-v3
 
 GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++17
-# std::optional
-GCC_REQD+=     8
+USE_LANGUAGES= c c++
+USE_CXX_FEATURES=      c++17
+# This package use std::optional.  std::optional is part of c++17, and
+# is not split out in mk/compiler/gcc.mk.  Thus, declaring c++17
+# results in a gcc7 requirement.  Work around this mk/ bug by
+# requiring a higher version.  Choose 10 to align with the
+# limited-versions guidance.
+GCC_REQD+=     10
 
 .include "../../mk/bsd.pkg.mk"