public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/libqb/files/, sys-cluster/libqb/
Date: Tue, 16 Mar 2021 22:14:23 +0000 (UTC)	[thread overview]
Message-ID: <1615932647.214d2c05f94fbcc57070805e3bd83c64cdefe564.sam@gentoo> (raw)

commit:     214d2c05f94fbcc57070805e3bd83c64cdefe564
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:10:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:10:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214d2c05

sys-cluster/libqb: fix build with slibtool

Thanks-to: orbea <orbea <AT> riseup.net>
Closes: https://bugs.gentoo.org/775605
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch | 19 +++++++++++++++++++
 sys-cluster/libqb/libqb-2.0.1-r1.ebuild            |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
new file mode 100644
index 00000000000..f96652c3066
--- /dev/null
+++ b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
@@ -0,0 +1,19 @@
+https://github.com/ClusterLabs/libqb/pull/440
+https://bugs.gentoo.org/775605
+
+From 84c09815fee4d1c2571ed1ef772812cac470a8f3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 11:13:45 -0700
+Subject: [PATCH] build: Fix undefined pthread reference.
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,8 @@ bmc_SOURCES = bmc.c
+ bmc_LDADD = $(top_builddir)/lib/libqb.la
+ 
+ bmcpt_SOURCES = bmcpt.c
+-bmcpt_LDADD = $(top_builddir)/lib/libqb.la
++bmcpt_CFLAGS = $(PTHREAD_CFLAGS)
++bmcpt_LDADD = $(PTHREAD_LIBS) $(top_builddir)/lib/libqb.la
+ 
+ bms_SOURCES = bms.c
+ bms_CFLAGS = $(GLIB_CFLAGS)

diff --git a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
index 0d08cf0e61a..acda01cfb90 100644
--- a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
+++ b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="app-arch/xz-utils
 
 DOCS=( ChangeLog README.markdown )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.1-slibtool.patch
+)
+
 src_prepare() {
 	default
 


                 reply	other threads:[~2021-03-16 22:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1615932647.214d2c05f94fbcc57070805e3bd83c64cdefe564.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox