aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-11-10 20:06:37 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-11-10 20:10:46 -0300
commit2cd5bcca03bee6f8f1ce4a1b4254e0ac2c365167 (patch)
tree842b544d290e39f4b46a6810c9aeb39fc300dc5c
parentb7984cc9c31064e6828c430f5cd03df49db3cdea (diff)
downloadaports-2cd5bcca03bee6f8f1ce4a1b4254e0ac2c365167.tar.gz
aports-2cd5bcca03bee6f8f1ce4a1b4254e0ac2c365167.tar.bz2
aports-2cd5bcca03bee6f8f1ce4a1b4254e0ac2c365167.tar.xz
main/sharutils: fix build with gcc-10
-rw-r--r--main/sharutils/APKBUILD10
-rw-r--r--main/sharutils/gcc-10.patch49
2 files changed, 54 insertions, 5 deletions
diff --git a/main/sharutils/APKBUILD b/main/sharutils/APKBUILD
index cc0003cfc9..deb8b52a9a 100644
--- a/main/sharutils/APKBUILD
+++ b/main/sharutils/APKBUILD
@@ -11,10 +11,11 @@ depends="bzip2 xz"
makedepends="gettext-dev texinfo"
checkdepends="diffutils"
subpackages="$pkgname-lang $pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/sharutils/sharutils-$pkgver.tar.xz
+ gcc-10.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,14 +28,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/charset.alias
}
-sha512sums="80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d sharutils-4.15.2.tar.xz"
+sha512sums="80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d sharutils-4.15.2.tar.xz
+4b5addb5dd738a3f8ef07fdbfd3dc2b5c31c86062419388249fe324dc64450b5dcb19269b7f47236df1ba926254211c41b8ecfa39f0efe7b537ffd1b2de5bdba gcc-10.patch"
diff --git a/main/sharutils/gcc-10.patch b/main/sharutils/gcc-10.patch
new file mode 100644
index 0000000000..10e64227b9
--- /dev/null
+++ b/main/sharutils/gcc-10.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/706256
+
+Fix build failure on gcc-10/-fno-common.
+
+--- a/src/shar-opts.h
++++ b/src/shar-opts.h
+@@ -352,7 +352,7 @@ extern "C" {
+ * global exported definitions
+ */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+
+ extern bool initialization_done;
+ extern int optidx;
+--- a/src/unshar-opts.h
++++ b/src/unshar-opts.h
+@@ -192,7 +192,7 @@ extern "C" {
+ extern size_t separator_str_len;
+
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+
+
+ /* * * * * *
+--- a/src/uudecode-opts.h
++++ b/src/uudecode-opts.h
+@@ -170,7 +170,7 @@ extern "C" {
+ * global exported definitions
+ */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+
+
+ /* * * * * *
+--- a/src/uuencode-opts.h
++++ b/src/uuencode-opts.h
+@@ -166,7 +166,7 @@ extern "C" {
+ * global exported definitions
+ */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+
+
+ /* * * * * *
+