[1/1] package/gnutls: fix build on sparc
diff mbox series

Message ID 20190715163608.1903-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [1/1] package/gnutls: fix build on sparc
Related show

Commit Message

Fabrice Fontaine July 15, 2019, 4:36 p.m. UTC
gnutls source code uses the C++11 <atomic> functionality since
https://github.com/gnutls/gnutls/commit/7978a733460f92b31033affd0e487c86d66c643d,
which internally is implemented using the __atomic_*() gcc built-ins

On certain architectures, the __atomic_*() built-ins are implemented in
the libatomic library that comes with the rest of the gcc runtime. Due
to this, code using <atomic> might need to link against libatomic,
otherwise one hits build issues such as:

../lib/.libs/libgnutls.so: undefined reference to `__atomic_fetch_sub_4'

on an architecture like SPARC.

To solve this, link against libatomic if BR2_PACKAGE_HAS_LIBATOMIC is set.

This fix gnutls build failures as well as cups, gnupg and libmicrohttpd

Fixes:
 - http://autobuild.buildroot.org/results/1c7541fc6ac4b52d1dfe02a9a7d61db90f4521eb
 - http://autobuild.buildroot.org/results/42c8803b98e38ebd48870fe6b1a20a1d6c351e5f
 - http://autobuild.buildroot.org/results/a1e96d02d41f7fec0f5327f65fb34405f963a1e9
 - http://autobuild.buildroot.org/results/59c92706457a9da29dd44425e546a7c80c18b454

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/gnutls/gnutls.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni July 17, 2019, 6:39 a.m. UTC | #1
On Mon, 15 Jul 2019 18:36:08 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> gnutls source code uses the C++11 <atomic> functionality since
> https://github.com/gnutls/gnutls/commit/7978a733460f92b31033affd0e487c86d66c643d,
> which internally is implemented using the __atomic_*() gcc built-ins
> 
> On certain architectures, the __atomic_*() built-ins are implemented in
> the libatomic library that comes with the rest of the gcc runtime. Due
> to this, code using <atomic> might need to link against libatomic,
> otherwise one hits build issues such as:
> 
> ../lib/.libs/libgnutls.so: undefined reference to `__atomic_fetch_sub_4'
> 
> on an architecture like SPARC.
> 
> To solve this, link against libatomic if BR2_PACKAGE_HAS_LIBATOMIC is set.
> 
> This fix gnutls build failures as well as cups, gnupg and libmicrohttpd
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/1c7541fc6ac4b52d1dfe02a9a7d61db90f4521eb
>  - http://autobuild.buildroot.org/results/42c8803b98e38ebd48870fe6b1a20a1d6c351e5f
>  - http://autobuild.buildroot.org/results/a1e96d02d41f7fec0f5327f65fb34405f963a1e9
>  - http://autobuild.buildroot.org/results/59c92706457a9da29dd44425e546a7c80c18b454
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/gnutls/gnutls.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Aug. 4, 2019, 8:11 p.m. UTC | #2
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > gnutls source code uses the C++11 <atomic> functionality since
 > https://github.com/gnutls/gnutls/commit/7978a733460f92b31033affd0e487c86d66c643d,
 > which internally is implemented using the __atomic_*() gcc built-ins

 > On certain architectures, the __atomic_*() built-ins are implemented in
 > the libatomic library that comes with the rest of the gcc runtime. Due
 > to this, code using <atomic> might need to link against libatomic,
 > otherwise one hits build issues such as:

 > ../lib/.libs/libgnutls.so: undefined reference to `__atomic_fetch_sub_4'

 > on an architecture like SPARC.

 > To solve this, link against libatomic if BR2_PACKAGE_HAS_LIBATOMIC is set.

 > This fix gnutls build failures as well as cups, gnupg and libmicrohttpd

 > Fixes:
 >  - http://autobuild.buildroot.org/results/1c7541fc6ac4b52d1dfe02a9a7d61db90f4521eb
 >  - http://autobuild.buildroot.org/results/42c8803b98e38ebd48870fe6b1a20a1d6c351e5f
 >  - http://autobuild.buildroot.org/results/a1e96d02d41f7fec0f5327f65fb34405f963a1e9
 >  - http://autobuild.buildroot.org/results/59c92706457a9da29dd44425e546a7c80c18b454

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x and 2019.05.x, thanks.

Patch
diff mbox series

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 0e5bccc891..4f40b896ff 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -46,7 +46,7 @@  endif
 
 # Prerequisite for crywrap
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
-GNUTLS_CONF_ENV += LIBS="-largp"
+GNUTLS_LIBS += -largp
 GNUTLS_DEPENDENCIES += argp-standalone
 endif
 
@@ -86,4 +86,10 @@  else ifeq ($(BR2_PACKAGE_CA_CERTIFICATES),y)
 GNUTLS_CONF_OPTS += --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
 endif
 
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GNUTLS_LIBS += -latomic
+endif
+
+GNUTLS_CONF_ENV += LIBS="$(GNUTLS_LIBS)"
+
 $(eval $(autotools-package))