| Message ID | 1464386608-13165-1-git-send-email-bjorn.forsman@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Bjørn, All, On 2016-05-28 00:03 +0200, Bjørn Forsman spake thusly: > This is basically the same change as in 0515fe45661b6d320f8d2071df2 > ("Makefile: pass host PKG_CONFIG_PATH at "make menuconfig" time"). That > commit made sure to pass host PKG_CONFIG_PATH when invoking Buildroot's > own menuconfig program. This change ensures that the same is true for > third party menuconfig programs (i.e. Linux, uClibc and Busybox). > > This unbreaks "make {linux,uclibc}-menuconfig" for host platforms which > rely on PKG_CONFIG_PATH to find .pc files (e.g. NixOS). (When Busybox > updates to a more recent Kconfig snapshot, one that uses pkg-config to > find ncurses, "make busybox-menuconfig" will also start working.) > > Tested on Ubuntu and NixOS: > > $ make qemu_arm_versatile_defconfig > $ make linux-menuconfig > $ make > > Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/pkg-kconfig.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk > index 40d2f88..b0f5178 100644 > --- a/package/pkg-kconfig.mk > +++ b/package/pkg-kconfig.mk > @@ -143,7 +143,8 @@ endif > # nconfig, gconfig, xconfig). > # So we simply remove our PATH and PKG_CONFIG_* variables. > $(2)_CONFIGURATOR_MAKE_ENV = \ > - $$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) > + $$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \ > + PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" > > # Configuration editors (menuconfig, ...) > # > -- > 2.8.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hello, On Sat, 28 May 2016 00:03:28 +0200, Bjørn Forsman wrote: > This is basically the same change as in 0515fe45661b6d320f8d2071df2 > ("Makefile: pass host PKG_CONFIG_PATH at "make menuconfig" time"). That > commit made sure to pass host PKG_CONFIG_PATH when invoking Buildroot's > own menuconfig program. This change ensures that the same is true for > third party menuconfig programs (i.e. Linux, uClibc and Busybox). > > This unbreaks "make {linux,uclibc}-menuconfig" for host platforms which > rely on PKG_CONFIG_PATH to find .pc files (e.g. NixOS). (When Busybox > updates to a more recent Kconfig snapshot, one that uses pkg-config to > find ncurses, "make busybox-menuconfig" will also start working.) > > Tested on Ubuntu and NixOS: > > $ make qemu_arm_versatile_defconfig > $ make linux-menuconfig > $ make > > Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> > --- > package/pkg-kconfig.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 40d2f88..b0f5178 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -143,7 +143,8 @@ endif # nconfig, gconfig, xconfig). # So we simply remove our PATH and PKG_CONFIG_* variables. $(2)_CONFIGURATOR_MAKE_ENV = \ - $$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) + $$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \ + PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" # Configuration editors (menuconfig, ...) #
This is basically the same change as in 0515fe45661b6d320f8d2071df2 ("Makefile: pass host PKG_CONFIG_PATH at "make menuconfig" time"). That commit made sure to pass host PKG_CONFIG_PATH when invoking Buildroot's own menuconfig program. This change ensures that the same is true for third party menuconfig programs (i.e. Linux, uClibc and Busybox). This unbreaks "make {linux,uclibc}-menuconfig" for host platforms which rely on PKG_CONFIG_PATH to find .pc files (e.g. NixOS). (When Busybox updates to a more recent Kconfig snapshot, one that uses pkg-config to find ncurses, "make busybox-menuconfig" will also start working.) Tested on Ubuntu and NixOS: $ make qemu_arm_versatile_defconfig $ make linux-menuconfig $ make Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> --- package/pkg-kconfig.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)