mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
libqb: Upgrade to 2.0.3
Remove one backported patch and add libxml2 to DEPNEDS to fix below configure error: | configure: error: Package requirements (libxml-2.0) were not met: | | No package 'libxml-2.0' found Remove NOSECTION_FALLBACK as the configure option enable-nosection-fallback is removed in the new version [1]. [1] https://github.com/ClusterLabs/libqb/commit/633f2624a7b42eb8e227e8e0e9f584d80ee3ead2 Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-56
@@ -1,56 +0,0 @@
|
|||||||
From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
||||||
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 <fdinitto@redhat.com>
|
|
||||||
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
configure.ac | 2 +-
|
|
||||||
lib/Makefile.am | 4 +++-
|
|
||||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 9900310..f9761cc 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 6ca6b15..b035f0b 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" \
|
|
||||||
> $@
|
|
||||||
|
|
||||||
--
|
|
||||||
2.16.2
|
|
||||||
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
SUMMARY = "An IPC library for high performance servers"
|
|
||||||
DESCRIPTION = "libqb is a library with the primary purpose of providing high performance client server reusable features. \
|
|
||||||
It provides high performance logging, tracing, ipc, and poll."
|
|
||||||
|
|
||||||
HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki"
|
|
||||||
SECTION = "libs"
|
|
||||||
LICENSE = "LGPL-2.1"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
|
||||||
|
|
||||||
# v1.0.5
|
|
||||||
SRCREV = "d08dbcf08b0da418bce9b5427dfd89522916322a"
|
|
||||||
SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=version_1 \
|
|
||||||
file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \
|
|
||||||
"
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
# otherwise do_configure fails
|
|
||||||
# configure:21609: checking whether linker workaround for orphan sections usable
|
|
||||||
# configure:21639: i586-oe-linux-gcc -m32 -march=i586 --sysroot=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot -o conftest -O -fno-omit-frame-pointer -g -feliminate-unused-debug-types -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0=/usr/src/debug/libqb/1.0.3+gitAUTOINC+c235284b5f-r0 -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot= -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native= -pipe -pthread -D_REENTRANT -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,conftest.ld conftest.c >&5
|
|
||||||
# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script
|
|
||||||
# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791
|
|
||||||
# collect2: error: ld returned 1 exit status
|
|
||||||
NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}"
|
|
||||||
NOSECTION_FALLBACK:toolchain-clang:mips64 = "--enable-nosection-fallback"
|
|
||||||
|
|
||||||
EXTRA_OECONF += "${NOSECTION_FALLBACK}"
|
|
||||||
|
|
||||||
CFLAGS += "-pthread -D_REENTRANT"
|
|
||||||
|
|
||||||
do_configure:prepend() {
|
|
||||||
( cd ${S}
|
|
||||||
${S}/autogen.sh )
|
|
||||||
}
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
SUMMARY = "An IPC library for high performance servers"
|
||||||
|
DESCRIPTION = "libqb is a library with the primary purpose of providing high performance client server reusable features. \
|
||||||
|
It provides high performance logging, tracing, ipc, and poll."
|
||||||
|
|
||||||
|
HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki"
|
||||||
|
SECTION = "libs"
|
||||||
|
LICENSE = "LGPL-2.1"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
|
SRCREV = "404adbcd998ec83643e47d92b3ea8d9c3970e68b"
|
||||||
|
SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
|
||||||
|
"
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
DEPENDS += "libxml2"
|
||||||
|
|
||||||
|
CFLAGS += "-pthread -D_REENTRANT"
|
||||||
|
|
||||||
|
do_configure:prepend() {
|
||||||
|
( cd ${S}
|
||||||
|
${S}/autogen.sh )
|
||||||
|
}
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
Reference in New Issue
Block a user