diff mbox series

[v2,1/1] package/dhcp: fix build without atomic

Message ID 20220528202627.2082719-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [v2,1/1] package/dhcp: fix build without atomic | expand

Commit Message

Fabrice Fontaine May 28, 2022, 8:26 p.m. UTC
Fix the following build failure without atomic raised since commit
fde21979427ffeb4fe9c0068310be195f2dec5ec:

/nvmedata/autobuild/instance-25/output-1/host/lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: cannot find -latomic: No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/db6/db6923915e36bcdb2953a3cdd2b450fa10794631

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Move BR2_TOOLCHAIN_HAS_LIBATOMIC block inside 
   BR2_TOOLCHAIN_HAS_ATOMIC block

 package/dhcp/dhcp.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Yann E. MORIN May 28, 2022, 10:14 p.m. UTC | #1
Fabrice, All,

On 2022-05-28 22:26 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure without atomic raised since commit
> fde21979427ffeb4fe9c0068310be195f2dec5ec:
> 
> /nvmedata/autobuild/instance-25/output-1/host/lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: cannot find -latomic: No such file or directory
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/db6/db6923915e36bcdb2953a3cdd2b450fa10794631
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Move BR2_TOOLCHAIN_HAS_LIBATOMIC block inside 
>    BR2_TOOLCHAIN_HAS_ATOMIC block
> 
>  package/dhcp/dhcp.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
> index cbc95cb152..183c8322d6 100644
> --- a/package/dhcp/dhcp.mk
> +++ b/package/dhcp/dhcp.mk
> @@ -62,9 +62,14 @@ else
>  DHCP_BIND_EXTRA_CONFIG += --without-zlib
>  endif
>  
> +ifeq ($(BR2_TOOLCHAIN_HAS_ATOMIC),y)
> +DHCP_BIND_EXTRA_CONFIG += --enable-atomic
>  ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
>  DHCP_CONF_ENV += LIBS=-latomic
>  endif
> +else
> +DHCP_BIND_EXTRA_CONFIG += --disable-atomic
> +endif
>  
>  ifeq ($(BR2_STATIC_LIBS),y)
>  DHCP_CONF_OPTS += --disable-libtool
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Peter Korsgaard June 6, 2022, 10:30 a.m. UTC | #2
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure without atomic raised since commit
 > fde21979427ffeb4fe9c0068310be195f2dec5ec:

 > /nvmedata/autobuild/instance-25/output-1/host/lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: cannot find -latomic: No such file or directory

 > Fixes:
 >  - http://autobuild.buildroot.org/results/db6/db6923915e36bcdb2953a3cdd2b450fa10794631

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Move BR2_TOOLCHAIN_HAS_LIBATOMIC block inside 
 >    BR2_TOOLCHAIN_HAS_ATOMIC block

Committed to 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index cbc95cb152..183c8322d6 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -62,9 +62,14 @@  else
 DHCP_BIND_EXTRA_CONFIG += --without-zlib
 endif
 
+ifeq ($(BR2_TOOLCHAIN_HAS_ATOMIC),y)
+DHCP_BIND_EXTRA_CONFIG += --enable-atomic
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 DHCP_CONF_ENV += LIBS=-latomic
 endif
+else
+DHCP_BIND_EXTRA_CONFIG += --disable-atomic
+endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DHCP_CONF_OPTS += --disable-libtool