From 447f94ee8dec7fc660d913c8f7588d5c2a13f770 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 11:57:29 -0700 Subject: [PATCH 01/15] musl: use nullptr for NULL in >=C++11 --- ...88a9da5e7b2925dda17a2d6820dddf1fb287.patch | 138 ++++++++++++++++++ srcpkgs/musl/template | 2 +- 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch diff --git a/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch new file mode 100644 index 000000000000..4fbe2e6c9314 --- /dev/null +++ b/srcpkgs/musl/patches/98e688a9da5e7b2925dda17a2d6820dddf1fb287.patch @@ -0,0 +1,138 @@ +From 98e688a9da5e7b2925dda17a2d6820dddf1fb287 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno +Date: Sun, 15 Aug 2021 17:51:57 +0200 +Subject: [PATCH] define NULL as nullptr when used in C++11 or later + +This should be safer for casting and more compatible with existing code +bases that wrongly assume it must be defined as a pointer. +--- + include/locale.h | 4 +++- + include/stddef.h | 4 +++- + include/stdio.h | 4 +++- + include/stdlib.h | 4 +++- + include/string.h | 4 +++- + include/time.h | 4 +++- + include/unistd.h | 4 +++- + include/wchar.h | 4 +++- + 8 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/include/locale.h b/include/locale.h +index ce384381c..11106fea8 100644 +--- a/include/locale.h ++++ b/include/locale.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stddef.h b/include/stddef.h +index bd7538535..f25b86396 100644 +--- a/include/stddef.h ++++ b/include/stddef.h +@@ -1,7 +1,9 @@ + #ifndef _STDDEF_H + #define _STDDEF_H + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stdio.h b/include/stdio.h +index 3604198c3..d1ed01f03 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -25,7 +25,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/stdlib.h b/include/stdlib.h +index 7af86e3bc..b507ca33b 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/string.h b/include/string.h +index 795a2abcd..43ad0942e 100644 +--- a/include/string.h ++++ b/include/string.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/time.h b/include/time.h +index 5494df183..3d9483720 100644 +--- a/include/time.h ++++ b/include/time.h +@@ -7,7 +7,9 @@ extern "C" { + + #include + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/unistd.h b/include/unistd.h +index 130640260..ee2dbe8af 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -15,7 +15,9 @@ extern "C" { + #define SEEK_CUR 1 + #define SEEK_END 2 + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) +diff --git a/include/wchar.h b/include/wchar.h +index 88eb55b18..ed5d774df 100644 +--- a/include/wchar.h ++++ b/include/wchar.h +@@ -38,7 +38,9 @@ extern "C" { + #define WCHAR_MIN (-1-0x7fffffff+L'\0') + #endif + +-#ifdef __cplusplus ++#if __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__cplusplus) + #define NULL 0L + #else + #define NULL ((void*)0) diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index c77cc2b6c405..07b86b0084f4 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=15 +revision=16 archs="*-musl" bootstrap=yes build_style=gnu-configure From 60ce9a5709af9579b9bfefbe76e5acff92de1e74 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 02/15] cross-aarch64-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-aarch64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 8038b28d70ad..80d2fedb7e9c 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-aarch64-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=armv8-a" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From ee59fe1aa3b5101fb78f2eb3afb35096297bcd90 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 03/15] cross-arm-linux-musleabi: rebuild for nullptr patch --- srcpkgs/cross-arm-linux-musleabi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index ee59931d6d93..e98a384ffadf 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-arm-linux-musleabi version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=armv5te --with-float=soft" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 88feec77c124ba730e1e10ca8b8139ba66b0848c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 04/15] cross-arm-linux-musleabihf: rebuild for nullptr patch --- srcpkgs/cross-arm-linux-musleabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 333db95425dd..09a511315acd 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-arm-linux-musleabihf version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 626ce2b30be23a4da33352ff46adf9b220d6b78b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 05/15] cross-armv7l-linux-musleabihf: rebuild for nullptr patch --- srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 3c4ea2357661..c38d5836a0c3 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-armv7l-linux-musleabihf version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 637b9b5cc85bd683eca23a5d1754bcd6b0d1ecb9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 06/15] cross-i686-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-i686-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 6dc3fdcba07a..ec8501daad33 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-i686-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel From ac526d7833f9fd2c7814fa547e0777aded327d8b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:36 -0700 Subject: [PATCH 07/15] cross-mips-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-mips-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index f783961d70d2..b50afed940f0 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mips-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From f799cbe018eff7e817dd987d3beb14f95ace7268 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 08/15] cross-mips-linux-muslhf: rebuild for nullptr patch --- srcpkgs/cross-mips-linux-muslhf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index fe41bc80d808..06bf9a58fcfe 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mips-linux-muslhf version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From 21265a0194e273ce4c2854b3d83bf5ba6cd8043f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 09/15] cross-mipsel-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-mipsel-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 23247d5bc972..94c0d30484ac 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mipsel-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From 0cbf3d57ea8fb3190010df846e44b88835da6be1 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 10/15] cross-mipsel-linux-muslhf: rebuild for nullptr patch --- srcpkgs/cross-mipsel-linux-muslhf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index 8cc208c7e86d..b02f4efe9918 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mipsel-linux-muslhf version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From 67f11a45a7f9b3341caa36cb94d6a9b14f2ac930 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 11/15] cross-powerpc-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-powerpc-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index e06970d76b9e..51ec36d196e5 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-powerpc-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From 3bf9148da1a9f2605f5ef75c433962c8bb245b19 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 12/15] cross-powerpc64-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-powerpc64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template index b081a136ef29..9e942d344dd8 100644 --- a/srcpkgs/cross-powerpc64-linux-musl/template +++ b/srcpkgs/cross-powerpc64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-powerpc64-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux" From 83fdba846bab01386540bfc51c73c7392589d4bb Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 13/15] cross-powerpc64le-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-powerpc64le-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index a863233b5b32..9888df6390b7 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-powerpc64le-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux" From 8da37215f24eeaeb1a375d1ef5fd59a65483e22e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:37 -0700 Subject: [PATCH 14/15] cross-powerpcle-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-powerpcle-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template index 2f483e1f1ee5..5b441c0843a3 100644 --- a/srcpkgs/cross-powerpcle-linux-musl/template +++ b/srcpkgs/cross-powerpcle-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-powerpcle-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From 01d41b63889daece31c334a51c64fb978bb1d6b5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 12:00:38 -0700 Subject: [PATCH 15/15] cross-x86_64-linux-musl: rebuild for nullptr patch --- srcpkgs/cross-x86_64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 4984cd77f149..6c98a67b55b3 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-x86_64-linux-musl version=0.35 -revision=3 +revision=4 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel