ndisc6: gold does not work for risc-v here
PATCH 1/6 ndisc6: gold does not work for risc-v here
Signed-off-by Khem Raj <[email protected]>
--- meta-networking/recipes-support/ndisc6/ndisc6_git.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-support/ndisc6/ndisc6_git.bb +2 -0
@@ -20,6 +20,8 @@ inherit autotools gettext EXTRA_OECONF += "PERL=${USRBINPATH}/perl" LDFLAGS += "-fuse-ld=gold" +LDFLAGS_remove_riscv64 = "-fuse-ld=gold" + TOOLCHAIN = "gcc" USE_NLS = "yes"
Signature · 1 line
2.16.2
PATCH 2/6 krb5: Add -D_REENTRANT -pthread to CFLAGS on risc-v
This is not defined by gcc for risc-v, probably a bug in gcc but until then insulate ourselves
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/krb5/krb5_1.16.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-connectivity/krb5/krb5_1.16.bb +1 -0
@@ -51,6 +51,7 @@ CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regc ac_cv_file__etc_TIMEZONE=no" CFLAGS_append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" +CFLAGS_append_riscv64 = " -D_REENTRANT -pthread" LDFLAGS_append = " -pthread" do_configure() {
Signature · 1 line
2.16.2
PATCH 3/6 krb5: Correctly specify configure option --with-crypto-impl
In reply to Khem RajFixes
QA Issue: krb5: configure was passed unrecognised options: --with-pkinit-crypto-impl [unknown-configure-option]
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/krb5/krb5_1.16.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/krb5/krb5_1.16.bb +1 -1
@@ -40,7 +40,7 @@ S = "${WORKDIR}/${BP}/src" PACKAGECONFIG ??= "openssl" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" -PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl" +PACKAGECONFIG[openssl] = "--with-crypto-impl=openssl,,openssl" PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
Signature · 1 line
2.16.2
PATCH 4/6 waf-cross-answers: Add cross-answers-riscv64.txt
In reply to Khem RajRISC-V is newly added to OE-Core, waf needs to know about it during cross compile
Signed-off-by Khem Raj <[email protected]>
--- .../waf-cross-answers/cross-answers-riscv64.txt | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt new file +39 -0
@@ -0,0 +1,39 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK
Signature · 1 line
2.16.2
PATCH 5/6 libqb: Upgrade to 1.0.3
In reply to Khem RajDrop upstreamed patch
Backport another patch to fix out of tree build regression
Signed-off-by Khem Raj <[email protected]>
---
...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 -----------------
...onfigure-script-neglecting-re-enable-out-.patch | 56 ++++++++++++++++++++++
.../libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb} | 6 ++-
3 files changed, 60 insertions(+), 45 deletions(-)
delete mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch
create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch
rename meta-oe/recipes-extended/libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb} (77%)meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa13ae6..f4f0f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif -+ return 0; -+ -+]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) --- -2.12.1 -
meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file +56 -0
56 lines not on this page · raw message
meta-oe/recipes-extended/libqb/libqb_1.0.3.bb renamed from meta-oe/recipes-extended/libqb/libqb_1.0.2.bb +4 -2
@@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh )
Signature · 1 line
2.16.2
Re: [meta-oe][PATCH 5/6] libqb: Upgrade to 1.0.3
This version fails for me in world builds:
configure: Enabling inter-library dependencies:
checking whether GCC supports __attribute__((section()) + ld supports orphan sections... yes
checking whether linker emits global boundary symbols for orphan sections... no
checking whether linker workaround for orphan sections usable... no
configure: error: Would use section attribute, cannot; see --enable-nosection-fallback
Quoted 180 lines · Khem Raj
Drop upstreamed patch
Backport another patch to fix out of tree build regressionSigned-off-by Khem Raj <[email protected]>--- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ----------------- ...onfigure-script-neglecting-re-enable-out-.patch | 56 ++++++++++++++++++++++ .../libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb} | 6 ++- 3 files changed, 60 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove- runtime-check-for-CLOCK_MONOTONIC.patch create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-build-fix- configure-script-neglecting-re-enable-out-.patch rename meta-oe/recipes-extended/libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb}(77%)
(quoted diff) +0
-0runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/
libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patchdeleted file mode 100644
index 28bc5c07d..000000000
--- a/meta-oe/recipes-extended/libqb/libqb/0001-Remove- runtime-check-for-CLOCK_MONOTONIC.patch
+++/dev/nullmeta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted +0
-33@@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa13ae6..f4f0f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 &&
defined(CLOCK_MONOTONIC))
-+ #error No monotonic clock
-+#endif
-+ return 0;
-+
-+]])],meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted +0
-3- [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC],1, [Define to 1 if
clock_getres(CLOCK_MONOTONIC, &ts)works])
---
-2.12.1(quoted diff) +0
-1-(quoted diff) +0
-0configure-script-neglecting-re-enable-out-.patch b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix- configure-script-neglecting-re-enable-out-.patch new file mode 100644
index 000000000..c82f3bf01meta-oe/recipes-extended/libqb/libqb/0001-build-fix- new file +0
-0configure-script-neglecting-re-enable-out-.patch
meta-oe/recipes-extended/libqb/libqb/0001-build-fix- new file +4
-0@@ -0,0 +1,56 @@ +From 73d2aea33e32272bac693550e8a3b0e3ad89707f 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-enableout-of-tree
+ buildsmeta-oe/recipes-extended/libqb/libqb/0001-build-fix- new file +26
-0+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]> +--- +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}' \meta-oe/recipes-extended/libqb/libqb/0001-build-fix- new file +11
-0+ | 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 $< \meta-oe/recipes-extended/libqb/libqb/0001-build-fix- new file +6
-0+ | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ + > $@ + +-- +2.16.2 +meta-oe/recipes-extended/libqb/libqb_1.0.3.bb renamed from meta-oe/recipes-extended/libqb/libqb_1.0.2.bb +4
-2@@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() { ( cd ${S}${S}/autogen.sh )--
2.16.2--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 5/6] libqb: Upgrade to 1.0.3
Am i the only one seeing this failure?
I've reverted this upgrade back then and forgot about it.
Quoted 195 lines · Martin Jansa
This version fails for me in world builds:
configure: Enabling inter-library dependencies:
checking whether GCC supports __attribute__((section()) + ld supports orphan sections... yes
checking whether linker emits global boundary symbols for orphan sections... no
checking whether linker workaround for orphan sections usable... no
configure: error: Would use section attribute, cannot; see --enable-nosection-fallbackQuoted 180 lines · Khem Raj
Drop upstreamed patch
Backport another patch to fix out of tree build regressionSigned-off-by Khem Raj <[email protected]>--- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ----------------- ...onfigure-script-neglecting-re-enable-out-.patch | 56 ++++++++++++++++++++++ .../libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb} | 6 ++- 3 files changed, 60 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch rename meta-oe/recipes-extended/libqb/{libqb_1.0.2.bb => libqb_1.0.3.bb}(77%)
diff --git
a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patchb/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patchdeleted file mode 100644
index 28bc5c07d..000000000
---a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch+++/dev/nullmeta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted +0
-33@@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa13ae6..f4f0f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 &&
defined(CLOCK_MONOTONIC))
-+ #error No monotonic clock
-+#endif
-+ return 0;
-+
-+]])],meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted +0
-3- [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC],1, [Define to 1 if
clock_getres(CLOCK_MONOTONIC, &ts)works])
---
-2.12.1
-
diff --gita/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patchb/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patchnew file mode 100644
index 000000000..c82f3bf01
---/dev/null
+++b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patchmeta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file +4
-0@@ -0,0 +1,56 @@ +From 73d2aea33e32272bac693550e8a3b0e3ad89707f 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-enableout-of-tree
+ buildsmeta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file +26
-0+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]> +--- +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}' \meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file +11
-0+ | 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 $< \meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file +6
-0+ | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ + > $@ + +-- +2.16.2 +meta-oe/recipes-extended/libqb/libqb_1.0.3.bb renamed from meta-oe/recipes-extended/libqb/libqb_1.0.2.bb +4
-2@@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git <http://github.com/ClusterLabs/$%7BBPN%7D.git> \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() {( cd ${S} ${S}/autogen.sh )--
2.16.2--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 5/6] libqb: Upgrade to 1.0.3
Quoted 2 lines · Martin Jansa
Am i the only one seeing this failure?
probably due to gold linker. The failing test seems to indicate that a link test failed.
Quoted 227 lines
I've reverted this upgrade back then and forgot about it.
On Sat, Mar 31, 2018 at 8:04 AM Martin Jansa <[email protected] <mailto:[email protected]>> wrote:
This version fails for me in world builds: configure: Enabling inter-library dependencies: checking whether GCC supports __attribute__((section()) + ld supports orphan sections... yes checking whether linker emits global boundary symbols for orphan sections... no checking whether linker workaround for orphan sections usable... no configure: error: Would use section attribute, cannot; see --enable-nosection-fallback On Tue, Mar 20, 2018 at 4:59 AM, Khem Raj <[email protected] <mailto:[email protected]>> wrote: Drop upstreamed patch Backport another patch to fix out of tree build regression Signed-off-by: Khem Raj <[email protected] <mailto:[email protected]>> --- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ----------------- ...onfigure-script-neglecting-re-enable-out-.patch | 56 ++++++++++++++++++++++ .../libqb/{libqb_1.0.2.bb <http://libqb_1.0.2.bb> => libqb_1.0.3.bb <http://libqb_1.0.3.bb>} | 6 ++- 3 files changed, 60 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch rename meta-oe/recipes-extended/libqb/{libqb_1.0.2.bb <http://libqb_1.0.2.bb> => libqb_1.0.3.bb <http://libqb_1.0.3.bb>} (77%) diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted file mode 100644 index 28bc5c07d..000000000 --- a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected] <mailto:[email protected]>> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <[email protected] <mailto:[email protected]>> ---- - configure.ac <http://configure.ac> | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac <http://configure.ac> b/configure.ac <http://configure.ac> -index fa13ae6..f4f0f46 100644 ---- a/configure.ac <http://configure.ac> -+++ b/configure.ac <http://configure.ac> -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif -+ return 0; -+ -+]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) --- -2.12.1 - diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file mode 100644 index 000000000..c82f3bf01 --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch @@ -0,0 +1,56 @@ +From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <[email protected] <mailto:[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 <http://ci.kronosnet.org> project for spotting that. + +X-mas-present-for: Fabio M. Di Nitto <[email protected] <mailto:[email protected]>> +Signed-off-by: Jan Pokorný <[email protected] <mailto:[email protected]>> +--- +Upstream-Status: Backport + + configure.ac <http://configure.ac> | 2 +- + lib/Makefile.am | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac <http://configure.ac> b/configure.ac <http://configure.ac> +index 9900310..f9761cc 100644 +--- a/configure.ac <http://configure.ac> ++++ b/configure.ac <http://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 <http://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 + diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb <http://libqb_1.0.2.bb> b/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb <http://libqb_1.0.3.bb> similarity index 77% rename from meta-oe/recipes-extended/libqb/libqb_1.0.2.bb <http://libqb_1.0.2.bb> rename to meta-oe/recipes-extended/libqb/libqb_1.0.3.bb <http://libqb_1.0.3.bb> index 574f6601c..73cea5e39 100644 --- a/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb <http://libqb_1.0.2.bb> +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb <http://libqb_1.0.3.bb> @@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git <http://github.com/ClusterLabs/$%7BBPN%7D.git> \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) -- 2.16.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] <mailto:[email protected]> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 6/6 libgnome-keyring, gnome-keyring: Add build dep on glib-2.0-native
In reply to Khem RajFixes
run.do_configure.39296: line 176: glib-gettextize: command not found
Signed-off-by Khem Raj <[email protected]>
--- meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb | 2 +- meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI += "file://egg-asn1x.patch \ file://musl.patch \ " -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" +DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native glib-2.0-native" RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" LDFLAGS += "-lgmodule-2.0"
meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb +1 -1
@@ -13,7 +13,7 @@ PR = "r3" inherit gnomebase gtk-doc -DEPENDS = "dbus libgcrypt glib-2.0 intltool-native" +DEPENDS = "dbus libgcrypt glib-2.0 glib-2.0-native intltool-native" SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6" SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c"
Signature · 1 line
2.16.2