All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/dhcp: use internal bind
@ 2022-04-03 10:03 Fabrice Fontaine
  2022-04-04  6:19 ` James Hilliard
                   ` (3 more replies)
  0 siblings, 4 replies; 32+ messages in thread
From: Fabrice Fontaine @ 2022-04-03 10:03 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Use internal bind as dhcp doesn't build since bump of bind to version
9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 and upstream
doesn't plan to fix it any time soon:
https://gitlab.isc.org/isc-projects/dhcp/-/issues/233#note_276883

In file included from ../includes/dhcpd.h:91,
                 from ctrace.c:29:
../includes/omapip/isclib.h:51:10: fatal error: isc/boolean.h: No such file or directory
   51 | #include <isc/boolean.h>
      |          ^~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/d18b006dce7b46631ce8f4c72fb97eb861993939

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/dhcp/Config.in |  1 -
 package/dhcp/dhcp.mk   | 19 ++++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 515040c612..e0706efafb 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_DHCP
 	# fork()
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	select BR2_PACKAGE_BIND
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 18765a3639..f1e3c22f1c 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -9,8 +9,10 @@ DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = MPL-2.0
 DHCP_LICENSE_FILES = LICENSE
-DHCP_DEPENDENCIES = bind host-gawk
+DHCP_DEPENDENCIES = host-gawk
 DHCP_CPE_ID_VENDOR = isc
+# internal bind does not support parallel builds.
+DHCP_MAKE = $(MAKE1)
 
 # use libtool-enabled configure.ac
 define DHCP_LIBTOOL_AUTORECONF
@@ -21,11 +23,12 @@ DHCP_CONF_ENV = \
 	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
 		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
 	CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'
+DHCP_BIND_EXTRA_CONFIG = BUILD_CC='$(TARGET_CC)'
 
 DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk
 
 DHCP_CONF_OPTS = \
-	--with-libbind=$(STAGING_DIR)/usr \
+	--with-bind-extra-config="$(DHCP_BIND_EXTRA_CONFIG)" \
 	--with-randomdev=/dev/random \
 	--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 	--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -38,8 +41,18 @@ DHCP_CONF_OPTS = \
 	--with-relay-pid-file=/var/run/dhcrelay.pid \
 	--with-relay6-pid-file=/var/run/dhcrelay6.pid
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+DHCP_BIND_EXTRA_CONFIG += --with-zlib
+DHCP_DEPENDENCIES += zlib
+else
+DHCP_BIND_EXTRA_CONFIG += --without-zlib
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+DHCP_CONF_ENV += LIBS=-latomic
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
-DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`"
 DHCP_CONF_OPTS += --disable-libtool
 else
 DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 32+ messages in thread
* [Buildroot] [PATCH 1/1] package/dhcp: use internal bind
@ 2022-04-04 13:07 Edmundo Ferreira
  0 siblings, 0 replies; 32+ messages in thread
From: Edmundo Ferreira @ 2022-04-04 13:07 UTC (permalink / raw)
  To: buildroot

On Sun, 2022-04-03 at 12:03 +0200, Fabrice Fontaine wrote:

> Use internal bind as dhcp doesn't build since bump of bind to version
> 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 and
> upstream
> doesn't plan to fix it any time soon:
> https://gitlab.isc.org/isc-projects/dhcp/-/issues/233#note_276883
>
> In file included from ../includes/dhcpd.h:91,
>                  from ctrace.c:29:
> ../includes/omapip/isclib.h:51:10: fatal error: isc/boolean.h: No
> such file or directory
>    51 | #include <isc/boolean.h>
>       |          ^~~~~~~~~~~~~~~
>
> Fixes:
>  -
> http://autobuild.buildroot.org/results/d18b006dce7b46631ce8f4c72fb97eb861993939
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Reviewed-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/dhcp/Config.in |  1 -
>  package/dhcp/dhcp.mk   | 19 ++++++++++++++++---
>  2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
> index 515040c612..e0706efafb 100644
> --- a/package/dhcp/Config.in
> +++ b/package/dhcp/Config.in
> @@ -3,7 +3,6 @@ config BR2_PACKAGE_DHCP
>         # fork()
>         depends on BR2_USE_MMU
>         depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> -       select BR2_PACKAGE_BIND
>         help
>           DHCP relay agent from the ISC DHCP distribution.
>
> diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
> index 18765a3639..f1e3c22f1c 100644
> --- a/package/dhcp/dhcp.mk
> +++ b/package/dhcp/dhcp.mk
> @@ -9,8 +9,10 @@ DHCP_SITE =
> https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
>  DHCP_INSTALL_STAGING = YES
>  DHCP_LICENSE = MPL-2.0
>  DHCP_LICENSE_FILES = LICENSE
> -DHCP_DEPENDENCIES = bind host-gawk
> +DHCP_DEPENDENCIES = host-gawk
>  DHCP_CPE_ID_VENDOR = isc
> +# internal bind does not support parallel builds.
> +DHCP_MAKE = $(MAKE1)
>
>  # use libtool-enabled configure.ac
>  define DHCP_LIBTOOL_AUTORECONF
> @@ -21,11 +23,12 @@ DHCP_CONF_ENV = \
>         CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
>                 -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
>         CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'
> +DHCP_BIND_EXTRA_CONFIG = BUILD_CC='$(TARGET_CC)'
>
>  DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk
>
>  DHCP_CONF_OPTS = \
> -       --with-libbind=$(STAGING_DIR)/usr \
> +       --with-bind-extra-config="$(DHCP_BIND_EXTRA_CONFIG)" \
>         --with-randomdev=/dev/random \
>         --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
>         --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
> @@ -38,8 +41,18 @@ DHCP_CONF_OPTS = \
>         --with-relay-pid-file=/var/run/dhcrelay.pid \
>         --with-relay6-pid-file=/var/run/dhcrelay6.pid
>
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +DHCP_BIND_EXTRA_CONFIG += --with-zlib
> +DHCP_DEPENDENCIES += zlib
> +else
> +DHCP_BIND_EXTRA_CONFIG += --without-zlib
> +endif
> +
> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> +DHCP_CONF_ENV += LIBS=-latomic
> +endif
> +
>  ifeq ($(BR2_STATIC_LIBS),y)
> -DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs
> bind9`"
>  DHCP_CONF_OPTS += --disable-libtool
>  else
>  DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF

I can confirm that this issue is also present in 2022.02.x branch.
A backport to that branch would be nice.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 32+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/dhcp: use internal bind
@ 2022-04-05  3:54 Tim Hammer
  2022-04-05  6:19 ` Fabrice Fontaine
  0 siblings, 1 reply; 32+ messages in thread
From: Tim Hammer @ 2022-04-05  3:54 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot

On Sun, Apr 03, 2022 at 12:03:18PM +0200, Fabrice Fontaine wrote:
> Use internal bind as dhcp doesn't build since bump of bind to version
> 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 and upstream
> doesn't plan to fix it any time soon:
> https://gitlab.isc.org/isc-projects/dhcp/-/issues/233#note_276883
> 
> In file included from ../includes/dhcpd.h:91,
>                  from ctrace.c:29:
> ../includes/omapip/isclib.h:51:10: fatal error: isc/boolean.h: No such file or directory
>    51 | #include <isc/boolean.h>
>       |          ^~~~~~~~~~~~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/d18b006dce7b46631ce8f4c72fb97eb861993939
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/dhcp/Config.in |  1 -
>  package/dhcp/dhcp.mk   | 19 ++++++++++++++++---
>  2 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
> index 515040c612..e0706efafb 100644
> --- a/package/dhcp/Config.in
> +++ b/package/dhcp/Config.in
> @@ -3,7 +3,6 @@ config BR2_PACKAGE_DHCP
>  	# fork()
>  	depends on BR2_USE_MMU
>  	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> -	select BR2_PACKAGE_BIND
>  	help
>  	  DHCP relay agent from the ISC DHCP distribution.
>  
> diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
> index 18765a3639..f1e3c22f1c 100644
> --- a/package/dhcp/dhcp.mk
> +++ b/package/dhcp/dhcp.mk
> @@ -9,8 +9,10 @@ DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
>  DHCP_INSTALL_STAGING = YES
>  DHCP_LICENSE = MPL-2.0
>  DHCP_LICENSE_FILES = LICENSE
> -DHCP_DEPENDENCIES = bind host-gawk
> +DHCP_DEPENDENCIES = host-gawk
>  DHCP_CPE_ID_VENDOR = isc
> +# internal bind does not support parallel builds.
> +DHCP_MAKE = $(MAKE1)
>  
>  # use libtool-enabled configure.ac
>  define DHCP_LIBTOOL_AUTORECONF
> @@ -21,11 +23,12 @@ DHCP_CONF_ENV = \
>  	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
>  		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
>  	CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'
> +DHCP_BIND_EXTRA_CONFIG = BUILD_CC='$(TARGET_CC)'
>  

The only place BUILD_CC is used in the bundled bind-9.11 is to build lib/dns/gen, which needs to run on the host.
So this should be the host compiler, not the target.
I do not know the best/correct way to indicate this. To get past the issue I changed it to '/usr/bin/gcc'...

.Tim
Tim D. Hammer
tim.hammer@orolia.com

>  DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk
>  
>  DHCP_CONF_OPTS = \
> -	--with-libbind=$(STAGING_DIR)/usr \
> +	--with-bind-extra-config="$(DHCP_BIND_EXTRA_CONFIG)" \
>  	--with-randomdev=/dev/random \
>  	--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
>  	--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
> @@ -38,8 +41,18 @@ DHCP_CONF_OPTS = \
>  	--with-relay-pid-file=/var/run/dhcrelay.pid \
>  	--with-relay6-pid-file=/var/run/dhcrelay6.pid
>  
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +DHCP_BIND_EXTRA_CONFIG += --with-zlib
> +DHCP_DEPENDENCIES += zlib
> +else
> +DHCP_BIND_EXTRA_CONFIG += --without-zlib
> +endif
> +
> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> +DHCP_CONF_ENV += LIBS=-latomic
> +endif
> +
>  ifeq ($(BR2_STATIC_LIBS),y)
> -DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`"
>  DHCP_CONF_OPTS += --disable-libtool
>  else
>  DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 32+ messages in thread

end of thread, other threads:[~2022-04-21  9:25 UTC | newest]

Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03 10:03 [Buildroot] [PATCH 1/1] package/dhcp: use internal bind Fabrice Fontaine
2022-04-04  6:19 ` James Hilliard
2022-04-04 19:31 ` Arnout Vandecappelle
2022-04-04 19:55 ` Yann E. MORIN
2022-04-09 14:09 ` Peter Korsgaard
2022-04-12 11:15   ` Eugen.Hristev--- via buildroot
2022-04-12 11:22     ` Fabrice Fontaine
2022-04-12 11:33       ` Peter Korsgaard
2022-04-12 11:43         ` Eugen.Hristev--- via buildroot
2022-04-12 12:32           ` Eugen.Hristev--- via buildroot
2022-04-12 12:34           ` Peter Korsgaard
2022-04-12 18:17             ` Fabrice Fontaine
2022-04-13  7:54               ` Eugen.Hristev--- via buildroot
2022-04-13  8:29                 ` Peter Korsgaard
2022-04-14  9:10                   ` Eugen.Hristev--- via buildroot
2022-04-14  9:59                     ` Fabrice Fontaine
2022-04-14 16:44                       ` Fabrice Fontaine
2022-04-19  5:21                         ` Eugen.Hristev--- via buildroot
2022-04-19  9:08                           ` Fabrice Fontaine
2022-04-19 10:19                             ` Eugen.Hristev--- via buildroot
2022-04-19 16:12                               ` Fabrice Fontaine
2022-04-21  9:25                                 ` Eugen.Hristev--- via buildroot
2022-04-04 13:07 Edmundo Ferreira
2022-04-05  3:54 Tim Hammer
2022-04-05  6:19 ` Fabrice Fontaine
2022-04-05 12:15   ` Tim Hammer
2022-04-05 16:18     ` Peter Seiderer
2022-04-06  1:58       ` Tim Hammer
2022-04-06  7:08         ` Fabrice Fontaine
2022-04-06 12:58           ` Tim Hammer
2022-04-06 13:30             ` Fabrice Fontaine
2022-04-06 14:06               ` Fabrice Fontaine

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.