Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] bloaty: fix build on ppc32 and armv6 (use libatomic)
@ 2020-01-09  1:42 voidlinux-github
  2020-01-09 12:46 ` voidlinux-github
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-09  1:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages bloaty
https://github.com/void-linux/void-packages/pull/18123

bloaty: fix build on ppc32 and armv6 (use libatomic)
Need to give this a CI run.

A patch file from https://github.com/void-linux/void-packages/pull/18123.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bloaty-18123.patch --]
[-- Type: text/x-diff, Size: 1130 bytes --]

From 2bc76f12ca3120941ff554f528dfeda356315afb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 9 Jan 2020 02:41:23 +0100
Subject: [PATCH] bloaty: fix build on ppc32 and armv6 (use libatomic)

---
 srcpkgs/bloaty/template | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index 44d402dbbea..a94dc5befab 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -13,13 +13,24 @@ distfiles="https://github.com/google/bloaty/releases/download/v${version}/bloaty
 checksum=e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0
 
 case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="undefined reference to __atomic_fetch_add_8'" ;;
+	ppc64*) ;;
+	armv6*|ppc*) makedepends+=" libatomic-devel";;
 esac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" protobuf"
 fi
 
+post_extract() {
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		armv6*|ppc*)
+			echo 'target_link_libraries(libprotobuf atomic)' >> \
+				third_party/protobuf/cmake/libprotobuf.cmake
+		;;
+	esac
+}
+
 do_install() {
 	vbin build/bloaty
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-01-10 13:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-09  1:42 [PR PATCH] bloaty: fix build on ppc32 and armv6 (use libatomic) voidlinux-github
2020-01-09 12:46 ` voidlinux-github
2020-01-09 15:59 ` voidlinux-github
2020-01-10 13:03 ` voidlinux-github
2020-01-10 13:04 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-10 13:04 ` voidlinux-github
2020-01-10 13:05 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-10 13:05 ` [PR PATCH] [Merged]: " voidlinux-github
2020-01-10 13:05 ` voidlinux-github
2020-01-10 13:05 ` voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).