summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-03-30 22:53:17 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-03-30 22:53:17 +0000
commit933ace07371c396c899bfac168c7ca3a600cf9fa (patch)
tree88ad574e91dd491614a19097aac305d6fd7eac82 /user
parent0a1154aa0075189cf3c1db16e4c4ddb8be293930 (diff)
parent1fccae6a1429dda442a19de90cddf57b0f1020f3 (diff)
downloadpackages-933ace07371c396c899bfac168c7ca3a600cf9fa.tar.gz
packages-933ace07371c396c899bfac168c7ca3a600cf9fa.tar.bz2
packages-933ace07371c396c899bfac168c7ca3a600cf9fa.tar.xz
packages-933ace07371c396c899bfac168c7ca3a600cf9fa.zip
Merge branch 'cmus' into 'master'
user/cmus: Add -latomic on ppc See merge request !208
Diffstat (limited to 'user')
-rw-r--r--user/cmus/APKBUILD6
-rw-r--r--user/cmus/ppc-libatomic.patch29
2 files changed, 33 insertions, 2 deletions
diff --git a/user/cmus/APKBUILD b/user/cmus/APKBUILD
index 918cef34c..0be94312e 100644
--- a/user/cmus/APKBUILD
+++ b/user/cmus/APKBUILD
@@ -13,7 +13,8 @@ makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev
libcdio-paranoia-dev libmad-dev libmodplug-dev libvorbis-dev ncurses-dev
opusfile-dev pulseaudio-dev wavpack-dev"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+ ppc-libatomic.patch"
build() {
cd "$builddir"
@@ -60,4 +61,5 @@ package() {
make DESTDIR="$pkgdir" PREFIX=/usr install
}
-sha512sums="cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc cmus-2.8.0.tar.gz"
+sha512sums="cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc cmus-2.8.0.tar.gz
+06a91da06cc916aa475467aa90bd7170c7288b68459706c3416700e79ba8707fd7a85bded0c0d5d51d805c15f59ff395670f11318ca5a419d17ab1070a48775f ppc-libatomic.patch"
diff --git a/user/cmus/ppc-libatomic.patch b/user/cmus/ppc-libatomic.patch
new file mode 100644
index 000000000..7107fb5db
--- /dev/null
+++ b/user/cmus/ppc-libatomic.patch
@@ -0,0 +1,29 @@
+From 9a56c86a663e53195a32b7908cf2bd4349bad5c3 Mon Sep 17 00:00:00 2001
+From: Luis Ressel <aranea@aixah.de>
+Date: Fri, 29 Mar 2019 17:16:16 +0100
+Subject: [PATCH] Link against libatomic on ppc32. DO NOT UPSTREAM.
+
+Assuming that we'll always need libatomic on ppc32, but never elsewhere
+is hideous and broken, but gcc is making it a huge pain to handle this
+properly.
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index e76acdd..2cd5d45 100755
+--- a/configure
++++ b/configure
+@@ -98,6 +98,9 @@ check_compat()
+ CONFIG_CYGWIN=y
+ makefile_vars CONFIG_CYGWIN
+ esac
++
++ test ppc = "$(uname -m)" && try_link -latomic && COMPAT_LIBS="$COMPAT_LIBS -latomic"
++
+ makefile_vars COMPAT_LIBS
+ }
+
+--
+2.21.0
+