Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21b438b3b7dffe99dcdc9bcdae4d05d2fc3609a8
commit 21b438b3b7dffe99dcdc9bcdae4d05d2fc3609a8 Author: DeX77 <[email protected]> Date: Wed Jan 24 13:05:32 2018 +0100 libqb-1.0.3-3-x86_64 * fix downstream linkage diff --git a/source/lib-extra/libqb/FrugalBuild b/source/lib-extra/libqb/FrugalBuild index 668d0fe..51aa725 100644 --- a/source/lib-extra/libqb/FrugalBuild +++ b/source/lib-extra/libqb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libqb pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' archs=("x86_64") groups=('lib-extra') @@ -11,7 +11,9 @@ depends=("glibc") _F_github_author="ClusterLabs" _F_github_tag_v=y Finclude github -source=("https://github.com/ClusterLabs/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz";) -signatures=("${source[0]}.asc") +source=("https://github.com/ClusterLabs/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz"; \ + fix_link.patch ) +signatures=("${source[0]}.asc" '') +_Fbuild_autoreconf=y # optimization OK diff --git a/source/lib-extra/libqb/fix_link.patch b/source/lib-extra/libqb/fix_link.patch new file mode 100644 index 0000000..403a62d --- /dev/null +++ b/source/lib-extra/libqb/fix_link.patch @@ -0,0 +1,51 @@ +From 6d62b64752c2a94acc3974be4b2528f4d05363cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <[email protected]> +Date: Tue, 26 Dec 2017 00:02:26 +0100 +Subject: [PATCH] build: fix configure script neglecting, re-enable out-of-tree + builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For the former, a prototype and the final code got (hm, mysteriously) +intertwisted. For the latter, I am clearly guilty of (rare, anyway) +testing of the out-of-tree builds only with libqb-already-system-wide +scenario, which is rather shortsighted. + +Thanks Fabio and his ci.kronosnet.org project for spotting that. + +X-mas-present-for: Fabio M. Di Nitto <[email protected]> +Signed-off-by: Jan Pokorný <[email protected]> +--- + configure.ac | 2 +- + lib/Makefile.am | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 99003105..f9761ccf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then + | grep __stop___verbose | cut -d" " -f 3) + test "${verbose_start_addr}" = "${verbose_stop_addr}" \ + && gcc_has_attribute_section_visible=no \ +- || { verbose_start_type=$(${READELF} -s backup \ ++ || { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \ + | sed -n '/__start___verbose/{s/^\s*//p;q}' \ + | tr -s ' ' \ + | cut -d" " -f6) +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6ca6b151..b035f0b0 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -101,7 +101,9 @@ endif + endif + + qblog_script.ld: %.ld: %.ld.in +- $(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \ ++ $(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \ ++ -I$(top_srcdir)/include -I$(top_builddir)/include \ ++ -xc $< \ + | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ + > $@ +
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
