aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2022-05-24 17:24:35 +0000
committerMilan P. Stanić <mps@arvanta.net>2022-05-24 17:25:45 +0000
commite04699510339fbccf2861c13890696175b5b28f6 (patch)
tree4e1285fd51d28a4fb54b7b511e8754ce0751971a
parent96d5636f8c6191a33f67157fcf285a019f37fbb8 (diff)
downloadaports-e04699510339fbccf2861c13890696175b5b28f6.tar.gz
aports-e04699510339fbccf2861c13890696175b5b28f6.tar.bz2
aports-e04699510339fbccf2861c13890696175b5b28f6.tar.xz
testing/picolibc: fix build with new meson and enable riscv64
add upstream patch to fix build with newer meson
-rw-r--r--testing/picolibc/APKBUILD8
-rw-r--r--testing/picolibc/a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch40
2 files changed, 45 insertions, 3 deletions
diff --git a/testing/picolibc/APKBUILD b/testing/picolibc/APKBUILD
index 3ac27fe88c..fb92ba5ba3 100644
--- a/testing/picolibc/APKBUILD
+++ b/testing/picolibc/APKBUILD
@@ -6,14 +6,15 @@ _targets="
"
pkgname=picolibc
pkgver=1.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="A C standard library based on newlib with focus on compact size"
url="https://github.com/picolibc/picolibc"
makedepends="meson"
# s390x and riscv64 blocked by gcc-cross-embedded
-arch="all !s390x !riscv64"
+arch="all !s390x"
license="GPL-2.0-only AND LGPL-2.1-only AND 0BSD AND BSD-3-Clause AND GPL-3.0-only AND LGPL-3.0-only"
-source="$pkgname-$pkgver.tar.xz::https://github.com/picolibc/picolibc/releases/download/$pkgver/picolibc-$pkgver.tar.xz"
+source="$pkgname-$pkgver.tar.xz::https://github.com/picolibc/picolibc/releases/download/$pkgver/picolibc-$pkgver.tar.xz
+ a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch"
options="!check"
for target in $_targets; do
@@ -75,4 +76,5 @@ riscv_none_elf() {
sha512sums="
33fb67a23e36f3dd5934b6cf27d6dbb5abab5bd4439cb4d2c67c31750b590e198e7fc79363874bb775b109eddc636d6970e3cebabd0b857e9071cfcffc2ad351 picolibc-1.7.4.tar.xz
+3254abfb6d97ec6b8fdc23cae8c0d094d598155f9766ab1f40613721872d8a0a0b52385eab515b58da1ca521ec40c3e8e3166e1425c798d5674b9124af3fe72c a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch
"
diff --git a/testing/picolibc/a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch b/testing/picolibc/a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch
new file mode 100644
index 0000000000..aa7981825c
--- /dev/null
+++ b/testing/picolibc/a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb.patch
@@ -0,0 +1,40 @@
+From a8ae5ad10df0b14c0b5ab34d7b67d25ede317bdb Mon Sep 17 00:00:00 2001
+From: Yasushi SHOJI <yashi@spacecubics.com>
+Date: Wed, 26 Jan 2022 14:53:56 +0900
+Subject: [PATCH] meson.build: Fix description keyword in configuration set()
+
+There are two typo for the keyword 'description' for config data set()
+in meson.build.
+
+Meson 0.61 doesn't warn about this but a post v0.61 with the
+commit mesonbuild/meson/commit/574525673f6 will error out with:
+
+ meson.build:737:10: ERROR: configuration_data.set got unknown
+ keyword arguments "descrption"
+
+This is reported by @tcal-x.
+
+Closes #244.
+
+Signed-off-by: Yasushi SHOJI <yashi@spacecubics.com>
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f0d4c7c312..4f1c4ef2a9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -736,10 +736,10 @@ conf_data.set('HAVE_BUILTIN_EXPECT', have_builtin_expect, description: 'Compiler
+ conf_data.set('HAVE_ALLOC_SIZE', have_alloc_size, description: 'The compiler REALLY has the attribute __alloc_size__')
+ conf_data.set('_HAVE_ATTRIBUTE_ALWAYS_INLINE',
+ cc.has_function_attribute('always_inline'),
+- descrption: 'The compiler supports the always_inline function attribute')
++ description: 'The compiler supports the always_inline function attribute')
+ conf_data.set('_HAVE_ATTRIBUTE_GNU_INLINE',
+ cc.has_function_attribute('gnu_inline'),
+- descrption: 'The compiler supports the gnu_inline function attribute')
++ description: 'The compiler supports the gnu_inline function attribute')
+
+ # Obsolete newlib options
+ conf_data.set('_WANT_USE_LONG_TIME_T', get_option('newlib-long-time_t'), description: 'Obsoleted. Define time_t to long instead of using a 64-bit type')