diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-11-10 20:24:16 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-11-10 20:24:16 -0300 |
| commit | 752805974b525a2af2e6f3fc2f1f91d8731231e5 (patch) | |
| tree | 5a3125f4b1f1c0b0bd0920e2eebc458f134ffd18 | |
| parent | d570330a091e51bc1eea7573139f2c9df758a716 (diff) | |
main/sysfsutils: fix build on gcc-10
| -rw-r--r-- | main/sysfsutils/APKBUILD | 7 | ||||
| -rw-r--r-- | main/sysfsutils/gcc-10.patch | 31 |
2 files changed, 36 insertions, 2 deletions
diff --git a/main/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD index e6b8b32b43c..f3c18bdbe44 100644 --- a/main/sysfsutils/APKBUILD +++ b/main/sysfsutils/APKBUILD @@ -9,7 +9,9 @@ arch="all" options="!check" # No test suite license="GPL-2.0-only AND LGPL-2.1-only" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" -source="https://github.com/linux-ras/sysfsutils/archive/sysfsutils-$_pkgver.tar.gz" +source="https://github.com/linux-ras/sysfsutils/archive/sysfsutils-$_pkgver.tar.gz + gcc-10.patch + " builddir="$srcdir/$pkgname-$pkgname-$_pkgver" prepare() { @@ -30,4 +32,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f9e2dd77df5de7323c41940781eb161aaad092045379df13abc248c0dd8455ba9a793e2ee9f2b6d3effe87e07ea3e8cdc012bab926a49ba7f4fd48f22b3138f0 sysfsutils-2_1_0.tar.gz" +sha512sums="f9e2dd77df5de7323c41940781eb161aaad092045379df13abc248c0dd8455ba9a793e2ee9f2b6d3effe87e07ea3e8cdc012bab926a49ba7f4fd48f22b3138f0 sysfsutils-2_1_0.tar.gz +d50fac62278ade6fb0a39ade3a88857d351657095283e7a11cb9661f2ba29e97ce65311203187ae8121f65aefe9a0ad25acfb03de857aa0aa305d6dad5faf769 gcc-10.patch" diff --git a/main/sysfsutils/gcc-10.patch b/main/sysfsutils/gcc-10.patch new file mode 100644 index 00000000000..2c911fcfa32 --- /dev/null +++ b/main/sysfsutils/gcc-10.patch @@ -0,0 +1,31 @@ +Upstream: Should be +Reason: Fixes compilation with gcc-10 + +Taken from https://src.fedoraproject.org/rpms/sysfsutils/blob/master/f/0002-fix-compiler-complaints.patch + +diff --git a/test/test-defs.h b/test/test-defs.h +index b22909a..73ede6d 100644 +--- a/test/test-defs.h ++++ b/test/test-defs.h +@@ -42,7 +42,7 @@ + #define inval_path "/sys/invalid/path" + #define FUNC_TABLE_SIZE (sizeof(func_table)/sizeof(int)) + +-FILE *my_stdout; ++extern FILE *my_stdout; + + #define dbg_print(format, arg...) fprintf(my_stdout, format, ## arg) + +diff --git a/test/test.c b/test/test.c +index 2e8f201..f63e346 100644 +--- a/test/test.c ++++ b/test/test.c +@@ -27,6 +27,8 @@ + #include "test-defs.h" + #include <errno.h> + ++FILE *my_stdout; ++ + /*************************************************/ + char *function_name[] = { + "sysfs_get_mnt_path", |