* [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies.
@ 2015-04-06 16:57 Romain Naour
2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Romain Naour @ 2015-04-06 16:57 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
package/thrift/thrift.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk
index 094f8d0..409b04d 100644
--- a/package/thrift/thrift.mk
+++ b/package/thrift/thrift.mk
@@ -8,8 +8,9 @@ THRIFT_VERSION = 0.9.2
THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION)
THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost libevent openssl zlib
THRIFT_INSTALL_STAGING = YES
-HOST_THRIFT_DEPENDENCIES = host-boost host-libevent host-openssl host-pkgconf \
- host-zlib host-bison host-flex
+HOST_THRIFT_DEPENDENCIES = host-bison host-boost host-flex host-libevent \
+ host-openssl host-pkgconf host-zlib
+
THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \
--with-boost \
--with-boost-libdir=$(STAGING_DIR)/usr/lib \
--
1.9.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour @ 2015-04-06 16:57 ` Romain Naour 2015-04-06 20:14 ` Arnout Vandecappelle 2015-04-06 21:28 ` Thomas Petazzoni 2015-04-06 16:57 ` [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 Romain Naour ` (3 subsequent siblings) 4 siblings, 2 replies; 13+ messages in thread From: Romain Naour @ 2015-04-06 16:57 UTC (permalink / raw) To: buildroot Backport an upstream patch. Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- ...-check-minimum-required-version-of-automa.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch diff --git a/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch new file mode 100644 index 0000000..2019706 --- /dev/null +++ b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch @@ -0,0 +1,45 @@ +From 9b03d2b02d32302008d2bd0218b31b9a0ca5a748 Mon Sep 17 00:00:00 2001 +From: Jens Geyer <jensg@apache.org> +Date: Fri, 3 Apr 2015 12:37:03 +0200 +Subject: [PATCH] THRIFT-3071 check minimum required version of automake in + bootstrap.sh Client: Build process Patch: James E. King, III + <jim.king@simplivity.com> + +This closes #421 + +- remove a warning when using libtool + +"libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal])' to configure.ac," + +[Romain: + - remove the part for bootstrap.sh which is not + bundled in thrift archive. + - fix the comment] +Signed-off-by: Romain Naour <romain.naour@openwide.fr> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 5fa611e..8daeb03 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -18,6 +18,7 @@ + # + + AC_PREREQ(2.65) ++AC_CONFIG_MACRO_DIR([./aclocal]) + + AC_INIT([thrift], [0.9.2]) + +@@ -540,6 +541,7 @@ AC_CHECK_FUNCS([memset]) + AC_CHECK_FUNCS([mkdir]) + AC_CHECK_FUNCS([realpath]) + AC_CHECK_FUNCS([select]) ++AC_CHECK_FUNCS([setlocale]) + AC_CHECK_FUNCS([socket]) + AC_CHECK_FUNCS([strchr]) + AC_CHECK_FUNCS([strdup]) +-- +1.9.3 + -- 1.9.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning 2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour @ 2015-04-06 20:14 ` Arnout Vandecappelle 2015-04-06 20:43 ` Romain Naour 2015-04-06 21:28 ` Thomas Petazzoni 1 sibling, 1 reply; 13+ messages in thread From: Arnout Vandecappelle @ 2015-04-06 20:14 UTC (permalink / raw) To: buildroot On 06/04/15 18:57, Romain Naour wrote: > Backport an upstream patch. > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Minor comments below > --- > ...-check-minimum-required-version-of-automa.patch | 45 ++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch > > diff --git a/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch > new file mode 100644 > index 0000000..2019706 > --- /dev/null > +++ b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch > @@ -0,0 +1,45 @@ > +From 9b03d2b02d32302008d2bd0218b31b9a0ca5a748 Mon Sep 17 00:00:00 2001 > +From: Jens Geyer <jensg@apache.org> > +Date: Fri, 3 Apr 2015 12:37:03 +0200 > +Subject: [PATCH] THRIFT-3071 check minimum required version of automake in > + bootstrap.sh Client: Build process Patch: James E. King, III > + <jim.king@simplivity.com> Something went wrong with the subject line here. Upstream has the Client: and Patch: lines below the subject. > + > +This closes #421 > + > +- remove a warning when using libtool > + > +"libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal])' to configure.ac," > + > +[Romain: > + - remove the part for bootstrap.sh which is not > + bundled in thrift archive. > + - fix the comment] Well, that fixing was no success :-) Anyway it should be - fix the commit log accordingly Please also add a reference to the upstream commit, e.g. 4aa95df383bfa13c46a4dc0b41672ec29d476300 upstream or https://git-wip-us.apache.org/repos/asf?p=thrift.git;h=4aa95df383bfa13c46a4dc0b41672ec29d476300 Regards, Arnout > +Signed-off-by: Romain Naour <romain.naour@openwide.fr> > +--- > + configure.ac | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/configure.ac b/configure.ac > +index 5fa611e..8daeb03 100755 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -18,6 +18,7 @@ > + # > + > + AC_PREREQ(2.65) > ++AC_CONFIG_MACRO_DIR([./aclocal]) > + > + AC_INIT([thrift], [0.9.2]) > + > +@@ -540,6 +541,7 @@ AC_CHECK_FUNCS([memset]) > + AC_CHECK_FUNCS([mkdir]) > + AC_CHECK_FUNCS([realpath]) > + AC_CHECK_FUNCS([select]) > ++AC_CHECK_FUNCS([setlocale]) > + AC_CHECK_FUNCS([socket]) > + AC_CHECK_FUNCS([strchr]) > + AC_CHECK_FUNCS([strdup]) > +-- > +1.9.3 > + > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning 2015-04-06 20:14 ` Arnout Vandecappelle @ 2015-04-06 20:43 ` Romain Naour 0 siblings, 0 replies; 13+ messages in thread From: Romain Naour @ 2015-04-06 20:43 UTC (permalink / raw) To: buildroot Hi Arnout, Le 06/04/2015 22:14, Arnout Vandecappelle a ?crit : > On 06/04/15 18:57, Romain Naour wrote: >> Backport an upstream patch. >> >> Signed-off-by: Romain Naour <romain.naour@openwide.fr> > > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > Minor comments below > >> --- >> ...-check-minimum-required-version-of-automa.patch | 45 ++++++++++++++++++++++ >> 1 file changed, 45 insertions(+) >> create mode 100644 package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch >> >> diff --git a/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch >> new file mode 100644 >> index 0000000..2019706 >> --- /dev/null >> +++ b/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch >> @@ -0,0 +1,45 @@ >> +From 9b03d2b02d32302008d2bd0218b31b9a0ca5a748 Mon Sep 17 00:00:00 2001 >> +From: Jens Geyer <jensg@apache.org> >> +Date: Fri, 3 Apr 2015 12:37:03 +0200 >> +Subject: [PATCH] THRIFT-3071 check minimum required version of automake in >> + bootstrap.sh Client: Build process Patch: James E. King, III >> + <jim.king@simplivity.com> > > Something went wrong with the subject line here. Upstream has the Client: and > Patch: lines below the subject. Ok, I see. The commit tittle is correct in my git tree but the formatted patch is wrong... I had to add a new line between title and Client line... > >> + >> +This closes #421 >> + >> +- remove a warning when using libtool >> + >> +"libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal])' to configure.ac," >> + >> +[Romain: >> + - remove the part for bootstrap.sh which is not >> + bundled in thrift archive. >> + - fix the comment] > > Well, that fixing was no success :-) Anyway it should be Indeed :) Sorry > > - fix the commit log accordingly > > > Please also add a reference to the upstream commit, e.g. > > 4aa95df383bfa13c46a4dc0b41672ec29d476300 upstream > > or > > https://git-wip-us.apache.org/repos/asf?p=thrift.git;h=4aa95df383bfa13c46a4dc0b41672ec29d476300 > Thanks for the review, I'll resend an updated version after having some comments on patch 3/4 and 4/4 which are the aim of this series. Best regards, Romain > > > Regards, > Arnout > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning 2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour 2015-04-06 20:14 ` Arnout Vandecappelle @ 2015-04-06 21:28 ` Thomas Petazzoni 1 sibling, 0 replies; 13+ messages in thread From: Thomas Petazzoni @ 2015-04-06 21:28 UTC (permalink / raw) To: buildroot Dear Romain Naour, On Mon, 6 Apr 2015 18:57:28 +0200, Romain Naour wrote: > Backport an upstream patch. > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > --- > ...-check-minimum-required-version-of-automa.patch | 45 ++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch Applied, after taking into account Arnout's comments (hopefully correctly). Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour 2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour @ 2015-04-06 16:57 ` Romain Naour 2015-04-06 23:18 ` Arnout Vandecappelle 2015-04-07 20:22 ` Thomas Petazzoni 2015-04-06 16:57 ` [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive Romain Naour ` (2 subsequent siblings) 4 siblings, 2 replies; 13+ messages in thread From: Romain Naour @ 2015-04-06 16:57 UTC (permalink / raw) To: buildroot Fix the AX_CXX_COMPILE_STDCXX_11 macro which was broken in the previous release. Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- This will break packages that really depends on C++11 (like thrift). --- package/autoconf-archive/autoconf-archive.hash | 2 +- package/autoconf-archive/autoconf-archive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 9f975d5..c310f5a 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 dfd460d23a9690322dee29a355ea285b5774f37383d3741cf77a4ad6a11a7e81 autoconf-archive-2015.02.04.tar.xz +sha256 69715bdd078f552ca85e498a94543e11cb8bcdf0359e659b84d84d19372b0dc5 autoconf-archive-2015.02.24.tar.xz diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index 4479348..bd3b0c8 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2015.02.04 +AUTOCONF_ARCHIVE_VERSION = 2015.02.24 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception -- 1.9.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 2015-04-06 16:57 ` [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 Romain Naour @ 2015-04-06 23:18 ` Arnout Vandecappelle 2015-04-07 20:22 ` Thomas Petazzoni 1 sibling, 0 replies; 13+ messages in thread From: Arnout Vandecappelle @ 2015-04-06 23:18 UTC (permalink / raw) To: buildroot On 06/04/15 18:57, Romain Naour wrote: > Fix the AX_CXX_COMPILE_STDCXX_11 macro which was broken in the > previous release. > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> I checked that libsigrok (which really depends on this package) still works, but of course there could be other hidden dependencies like thrift. Regards, Arnout > --- > This will break packages that really depends on C++11 (like thrift). > --- > package/autoconf-archive/autoconf-archive.hash | 2 +- > package/autoconf-archive/autoconf-archive.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash > index 9f975d5..c310f5a 100644 > --- a/package/autoconf-archive/autoconf-archive.hash > +++ b/package/autoconf-archive/autoconf-archive.hash > @@ -1,2 +1,2 @@ > # Computed locally > -sha256 dfd460d23a9690322dee29a355ea285b5774f37383d3741cf77a4ad6a11a7e81 autoconf-archive-2015.02.04.tar.xz > +sha256 69715bdd078f552ca85e498a94543e11cb8bcdf0359e659b84d84d19372b0dc5 autoconf-archive-2015.02.24.tar.xz > diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk > index 4479348..bd3b0c8 100644 > --- a/package/autoconf-archive/autoconf-archive.mk > +++ b/package/autoconf-archive/autoconf-archive.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -AUTOCONF_ARCHIVE_VERSION = 2015.02.04 > +AUTOCONF_ARCHIVE_VERSION = 2015.02.24 > AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz > AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive > AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 2015-04-06 16:57 ` [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 Romain Naour 2015-04-06 23:18 ` Arnout Vandecappelle @ 2015-04-07 20:22 ` Thomas Petazzoni 1 sibling, 0 replies; 13+ messages in thread From: Thomas Petazzoni @ 2015-04-07 20:22 UTC (permalink / raw) To: buildroot Dear Romain Naour, On Mon, 6 Apr 2015 18:57:29 +0200, Romain Naour wrote: > Fix the AX_CXX_COMPILE_STDCXX_11 macro which was broken in the > previous release. > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Applied, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour 2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour 2015-04-06 16:57 ` [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 Romain Naour @ 2015-04-06 16:57 ` Romain Naour 2015-04-06 23:15 ` Arnout Vandecappelle 2015-04-06 20:08 ` [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Arnout Vandecappelle 2015-04-06 21:25 ` Thomas Petazzoni 4 siblings, 1 reply; 13+ messages in thread From: Romain Naour @ 2015-04-06 16:57 UTC (permalink / raw) To: buildroot The ax_cxx_compile_stdcxx_11 macro bundled in thrift package is brocken and out of date. Remove it and use the one provided by autoconf-archive package. Related to: [thrift] http://autobuild.buildroot.net/results/21e/21e3fff1e0d714f94ac7e621289d1a59bc02a05f/build-end.log [host-thrift] http://autobuild.buildroot.net/results/b89/b89ffc2bff699eb10bb6abd92369a43d4900354d/build-end.log Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- Now thrift will fail with non C++11 capable toolchains: checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features by default... no checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features with -std=c++11... no checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features with -std=c++0x... no --- .../0005-aclocal-remove-c-11-check-macro.patch | 158 +++++++++++++++++++++ package/thrift/thrift.mk | 4 +- 2 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 package/thrift/0005-aclocal-remove-c-11-check-macro.patch diff --git a/package/thrift/0005-aclocal-remove-c-11-check-macro.patch b/package/thrift/0005-aclocal-remove-c-11-check-macro.patch new file mode 100644 index 0000000..19c0c86 --- /dev/null +++ b/package/thrift/0005-aclocal-remove-c-11-check-macro.patch @@ -0,0 +1,158 @@ +From bffbd147b123782fe0112f3672ba621d755eb706 Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@openwide.fr> +Date: Mon, 6 Apr 2015 18:35:12 +0200 +Subject: [PATCH] aclocal: remove c++11 check macro + +The ax_cxx_compile_stdcxx_11 macro is brocken and out of date. + +Remove it and use the one provided by autoconf-archive package. + +Signed-off-by: Romain Naour <romain.naour@openwide.fr> +--- + aclocal/ax_cxx_compile_stdcxx_11.m4 | 134 ------------------------------------ + 1 file changed, 134 deletions(-) + delete mode 100644 aclocal/ax_cxx_compile_stdcxx_11.m4 + +diff --git a/aclocal/ax_cxx_compile_stdcxx_11.m4 b/aclocal/ax_cxx_compile_stdcxx_11.m4 +deleted file mode 100644 +index a4c9189..0000000 +--- a/aclocal/ax_cxx_compile_stdcxx_11.m4 ++++ /dev/null +@@ -1,134 +0,0 @@ +-# ============================================================================ +-# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +-# ============================================================================ +-# +-# SYNOPSIS +-# +-# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) +-# +-# DESCRIPTION +-# +-# Check for baseline language coverage in the compiler for the C++11 +-# standard; if necessary, add switches to CXXFLAGS to enable support. +-# +-# The first argument, if specified, indicates whether you insist on an +-# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +-# -std=c++11). If neither is specified, you get whatever works, with +-# preference for an extended mode. +-# +-# The second argument, if specified 'mandatory' or if left unspecified, +-# indicates that baseline C++11 support is required and that the macro +-# should error out if no mode with that support is found. If specified +-# 'optional', then configuration proceeds regardless, after defining +-# HAVE_CXX11 if and only if a supporting mode is found. +-# +-# LICENSE +-# +-# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> +-# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> +-# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> +-# +-# Copying and distribution of this file, with or without modification, are +-# permitted in any medium without royalty provided the copyright notice +-# and this notice are preserved. This file is offered as-is, without any +-# warranty. +- +-#serial 3 +- +-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ +- template <typename T> +- struct check +- { +- static_assert(sizeof(int) <= sizeof(T), "not big enough"); +- }; +- +- typedef check<check<bool>> right_angle_brackets; +- +- int a; +- decltype(a) b; +- +- typedef check<int> check_type; +- check_type c; +- check_type&& cr = static_cast<check_type&&>(c); +- +- auto d = a; +-]) +- +-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl +- m4_if([$1], [], [], +- [$1], [ext], [], +- [$1], [noext], [], +- [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl +- m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], +- [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], +- [$2], [optional], [ax_cxx_compile_cxx11_required=false], +- [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl +- AC_LANG_PUSH([C++])dnl +- ac_success=no +- AC_CACHE_CHECK(whether $CXX supports C++11 features by default, +- ax_cv_cxx_compile_cxx11, +- [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], +- [ax_cv_cxx_compile_cxx11=yes], +- [ax_cv_cxx_compile_cxx11=no])]) +- if test x$ax_cv_cxx_compile_cxx11 = xyes; then +- ac_success=yes +- fi +- +- m4_if([$1], [noext], [], [dnl +- if test x$ac_success = xno; then +- for switch in -std=gnu++11; do +- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) +- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, +- $cachevar, +- [ac_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS $switch" +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], +- [eval $cachevar=yes], +- [eval $cachevar=no]) +- CXXFLAGS="$ac_save_CXXFLAGS"]) +- if eval test x\$$cachevar = xyes; then +- CXXFLAGS="$CXXFLAGS $switch" +- ac_success=yes +- break +- fi +- done +- fi]) +- +- m4_if([$1], [ext], [], [dnl +- if test x$ac_success = xno; then +- for switch in -std=c++11; do +- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) +- AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, +- $cachevar, +- [ac_save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS $switch" +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], +- [eval $cachevar=yes], +- [eval $cachevar=no]) +- CXXFLAGS="$ac_save_CXXFLAGS"]) +- if eval test x\$$cachevar = xyes; then +- CXXFLAGS="$CXXFLAGS $switch" +- ac_success=yes +- break +- fi +- done +- fi]) +- AC_LANG_POP([C++]) +- if test x$ax_cxx_compile_cxx11_required = xtrue; then +- if test x$ac_success = xno; then +- AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) +- fi +- else +- if test x$ac_success = xno; then +- HAVE_CXX11=0 +- AC_MSG_NOTICE([No compiler with C++11 support was found]) +- else +- HAVE_CXX11=1 +- AC_DEFINE(HAVE_CXX11,1, +- [define if the compiler supports basic C++11 syntax]) +- fi +- +- AC_SUBST(HAVE_CXX11) +- fi +-]) +- +-- +1.9.3 + diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk index 409b04d..5d4c515 100644 --- a/package/thrift/thrift.mk +++ b/package/thrift/thrift.mk @@ -8,8 +8,8 @@ THRIFT_VERSION = 0.9.2 THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost libevent openssl zlib THRIFT_INSTALL_STAGING = YES -HOST_THRIFT_DEPENDENCIES = host-bison host-boost host-flex host-libevent \ - host-openssl host-pkgconf host-zlib +HOST_THRIFT_DEPENDENCIES = host-autoconf-archive host-bison host-boost \ + host-flex host-libevent host-openssl host-pkgconf host-zlib THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \ --with-boost \ -- 1.9.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive 2015-04-06 16:57 ` [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive Romain Naour @ 2015-04-06 23:15 ` Arnout Vandecappelle 2015-04-08 20:18 ` Romain Naour 0 siblings, 1 reply; 13+ messages in thread From: Arnout Vandecappelle @ 2015-04-06 23:15 UTC (permalink / raw) To: buildroot On 06/04/15 18:57, Romain Naour wrote: > The ax_cxx_compile_stdcxx_11 macro bundled in thrift package is > brocken and out of date. > Remove it and use the one provided by autoconf-archive package. > > Related to: > [thrift] > http://autobuild.buildroot.net/results/21e/21e3fff1e0d714f94ac7e621289d1a59bc02a05f/build-end.log > [host-thrift] > http://autobuild.buildroot.net/results/b89/b89ffc2bff699eb10bb6abd92369a43d4900354d/build-end.log I fail to see what this really fixes... For both build failures, it failed before this patch and it still fails after it... and it should fail since these compilers indeed are not fully C++11 compliant (missing virtual overrides which were added in gcc 4.7). Oh, I get it, it will now fail consistently, instead of failing depending on whether host-autoconf-archive has been installed or not... But the stupid thing is, the build does succeed with these non-conforming compilers, because thrift actually doesn't use that particular feature... So perhaps it's better to patch configure.ac and ax_cxx_compile_stdcxx_11.m4 to give the macro a different name, so that we can still compile thrift with gcc 4.5. Still... > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > --- > Now thrift will fail with non C++11 capable toolchains: > checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features by default... no > checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features with -std=c++11... no > checking whether /home/naourr/git/buildroot/test/thrift/host/usr/bin/powerpc-linux-gnu-g++ supports C++11 features with -std=c++0x... no > --- > .../0005-aclocal-remove-c-11-check-macro.patch | 158 +++++++++++++++++++++ > package/thrift/thrift.mk | 4 +- > 2 files changed, 160 insertions(+), 2 deletions(-) > create mode 100644 package/thrift/0005-aclocal-remove-c-11-check-macro.patch > > diff --git a/package/thrift/0005-aclocal-remove-c-11-check-macro.patch b/package/thrift/0005-aclocal-remove-c-11-check-macro.patch > new file mode 100644 > index 0000000..19c0c86 > --- /dev/null > +++ b/package/thrift/0005-aclocal-remove-c-11-check-macro.patch > @@ -0,0 +1,158 @@ > +From bffbd147b123782fe0112f3672ba621d755eb706 Mon Sep 17 00:00:00 2001 > +From: Romain Naour <romain.naour@openwide.fr> > +Date: Mon, 6 Apr 2015 18:35:12 +0200 > +Subject: [PATCH] aclocal: remove c++11 check macro > + > +The ax_cxx_compile_stdcxx_11 macro is brocken and out of date. > + > +Remove it and use the one provided by autoconf-archive package. This is not needed, autoreconf will pick up the newer version automatically. [snip] > diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk > index 409b04d..5d4c515 100644 > --- a/package/thrift/thrift.mk > +++ b/package/thrift/thrift.mk > @@ -8,8 +8,8 @@ THRIFT_VERSION = 0.9.2 > THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) > THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost libevent openssl zlib Missing dependency on host-autoconf-archive here. Regards, Arnout > THRIFT_INSTALL_STAGING = YES > -HOST_THRIFT_DEPENDENCIES = host-bison host-boost host-flex host-libevent \ > - host-openssl host-pkgconf host-zlib > +HOST_THRIFT_DEPENDENCIES = host-autoconf-archive host-bison host-boost \ > + host-flex host-libevent host-openssl host-pkgconf host-zlib > > THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \ > --with-boost \ > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive 2015-04-06 23:15 ` Arnout Vandecappelle @ 2015-04-08 20:18 ` Romain Naour 0 siblings, 0 replies; 13+ messages in thread From: Romain Naour @ 2015-04-08 20:18 UTC (permalink / raw) To: buildroot Hi Arnout, Le 07/04/2015 01:15, Arnout Vandecappelle a ?crit : > On 06/04/15 18:57, Romain Naour wrote: >> The ax_cxx_compile_stdcxx_11 macro bundled in thrift package is >> brocken and out of date. >> Remove it and use the one provided by autoconf-archive package. >> >> Related to: >> [thrift] >> http://autobuild.buildroot.net/results/21e/21e3fff1e0d714f94ac7e621289d1a59bc02a05f/build-end.log >> [host-thrift] >> http://autobuild.buildroot.net/results/b89/b89ffc2bff699eb10bb6abd92369a43d4900354d/build-end.log > > I fail to see what this really fixes... For both build failures, it failed > before this patch and it still fails after it... and it should fail since these > compilers indeed are not fully C++11 compliant (missing virtual overrides which > were added in gcc 4.7). > > Oh, I get it, it will now fail consistently, instead of failing depending on > whether host-autoconf-archive has been installed or not... I added a link to the macro bug report for v2 to explain the issue. http://savannah.gnu.org/patch/index.php?8287 > > But the stupid thing is, the build does succeed with these non-conforming > compilers, because thrift actually doesn't use that particular feature... > > So perhaps it's better to patch configure.ac and ax_cxx_compile_stdcxx_11.m4 to > give the macro a different name, so that we can still compile thrift with gcc 4.5. The macro accept a second argument to make C++11 optional: AX_CXX_COMPILE_STDCXX_11([noext], [optional]) Thrift build fine but produce lot of warning about anonymous variadic macros but it just for some debug macro: #define T_DEBUG(format_string,...) "warning: anonymous variadic macros were introduced in C99" And some warning about the use of --std=c++0x (C++03) long long which is available in gcc 4.5. "warning: use of C++0x long long integer constant" At least, it seems to be safe to make C++11 optional and use C++03 for this release... > > Still... > [snip] >> + >> +The ax_cxx_compile_stdcxx_11 macro is brocken and out of date. >> + >> +Remove it and use the one provided by autoconf-archive package. > > This is not needed, autoreconf will pick up the newer version automatically. OK > > [snip] > >> diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk >> index 409b04d..5d4c515 100644 >> --- a/package/thrift/thrift.mk >> +++ b/package/thrift/thrift.mk >> @@ -8,8 +8,8 @@ THRIFT_VERSION = 0.9.2 >> THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) >> THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost libevent openssl zlib > > Missing dependency on host-autoconf-archive here. Ok Best regards, Romain > > > Regards, > Arnout > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies. 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour ` (2 preceding siblings ...) 2015-04-06 16:57 ` [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive Romain Naour @ 2015-04-06 20:08 ` Arnout Vandecappelle 2015-04-06 21:25 ` Thomas Petazzoni 4 siblings, 0 replies; 13+ messages in thread From: Arnout Vandecappelle @ 2015-04-06 20:08 UTC (permalink / raw) To: buildroot On 06/04/15 18:57, Romain Naour wrote: > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Regards, Arnout > --- > package/thrift/thrift.mk | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk > index 094f8d0..409b04d 100644 > --- a/package/thrift/thrift.mk > +++ b/package/thrift/thrift.mk > @@ -8,8 +8,9 @@ THRIFT_VERSION = 0.9.2 > THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) > THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost libevent openssl zlib > THRIFT_INSTALL_STAGING = YES > -HOST_THRIFT_DEPENDENCIES = host-boost host-libevent host-openssl host-pkgconf \ > - host-zlib host-bison host-flex > +HOST_THRIFT_DEPENDENCIES = host-bison host-boost host-flex host-libevent \ > + host-openssl host-pkgconf host-zlib > + > THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \ > --with-boost \ > --with-boost-libdir=$(STAGING_DIR)/usr/lib \ > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies. 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour ` (3 preceding siblings ...) 2015-04-06 20:08 ` [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Arnout Vandecappelle @ 2015-04-06 21:25 ` Thomas Petazzoni 4 siblings, 0 replies; 13+ messages in thread From: Thomas Petazzoni @ 2015-04-06 21:25 UTC (permalink / raw) To: buildroot Dear Romain Naour, On Mon, 6 Apr 2015 18:57:27 +0200, Romain Naour wrote: > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > --- > package/thrift/thrift.mk | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Applied, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-04-08 20:18 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-04-06 16:57 [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Romain Naour 2015-04-06 16:57 ` [Buildroot] [PATCH 2/4] package/thrift: fix libtool warning Romain Naour 2015-04-06 20:14 ` Arnout Vandecappelle 2015-04-06 20:43 ` Romain Naour 2015-04-06 21:28 ` Thomas Petazzoni 2015-04-06 16:57 ` [Buildroot] [PATCH 3/4] package/autoconf-archive: bump to version v2015.02.24 Romain Naour 2015-04-06 23:18 ` Arnout Vandecappelle 2015-04-07 20:22 ` Thomas Petazzoni 2015-04-06 16:57 ` [Buildroot] [PATCH 4/4] package/thrift: add dependency on host-autoconf-archive Romain Naour 2015-04-06 23:15 ` Arnout Vandecappelle 2015-04-08 20:18 ` Romain Naour 2015-04-06 20:08 ` [Buildroot] [PATCH 1/4] package/thrift: reorders alphabetically the dependencies Arnout Vandecappelle 2015-04-06 21:25 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox