diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-12-30 22:59:25 +0900 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-03 10:17:16 +0100 |
commit | c17116dc3818b45cbc3997de72d05e64aab04cbe (patch) | |
tree | 819c3aeb8f5fb4ff5a3135f7f52c0854b065b6c2 /scripts | |
parent | 259d9bdaf2bfc6882910005a0ef4b3199139ebe2 (diff) | |
download | barebox-c17116dc3818b45cbc3997de72d05e64aab04cbe.tar.gz barebox-c17116dc3818b45cbc3997de72d05e64aab04cbe.tar.xz |
kbuild: rename HOSTLOADLIBES_* to HOSTLDLIBS_*
This is needed to resync kconfig to the latest Linux.
Refer to Linux commit 8377bd2b9ee1 ("kbuild: Rename HOST_LOADLIBES
to KBUILD_HOSTLDLIBS").
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile | 6 | ||||
-rw-r--r-- | scripts/Makefile.host | 6 | ||||
-rw-r--r-- | scripts/imx/Makefile | 4 | ||||
-rw-r--r-- | scripts/kconfig/Makefile | 10 | ||||
-rw-r--r-- | scripts/tegra/Makefile | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index 59d22e18bd..ff0a3c2a07 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -21,12 +21,12 @@ hostprogs-$(CONFIG_ARCH_ZYNQ) += zynq_mkimage hostprogs-$(CONFIG_ARCH_SOCFPGA) += socfpga_mkimage hostprogs-$(CONFIG_MXS_HOSTTOOLS)+= mxsimage mxsboot HOSTCFLAGS += -I$(srctree)/scripts/include/ -HOSTLOADLIBES_mxsimage = `pkg-config --libs openssl` +HOSTLDLIBS_mxsimage = `pkg-config --libs openssl` HOSTCFLAGS_omap3-usb-loader.o = `pkg-config --cflags libusb-1.0` -HOSTLOADLIBES_omap3-usb-loader = `pkg-config --libs libusb-1.0` +HOSTLDLIBS_omap3-usb-loader = `pkg-config --libs libusb-1.0` hostprogs-$(CONFIG_OMAP3_USB_LOADER) += omap3-usb-loader HOSTCFLAGS_omap4_usbboot.o = `pkg-config --cflags libusb-1.0` -HOSTLOADLIBES_omap4_usbboot = -lpthread `pkg-config --libs libusb-1.0` +HOSTLDLIBS_omap4_usbboot = -lpthread `pkg-config --libs libusb-1.0` hostprogs-$(CONFIG_OMAP4_HOSTTOOL_USBBOOT) += omap4_usbboot subdir-y += mod diff --git a/scripts/Makefile.host b/scripts/Makefile.host index a89a0c5d43..8a88cbc9ae 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -86,7 +86,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) # host-csingle -> Executable quiet_cmd_host-csingle = HOSTCC $@ cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(HOSTLDFLAGS) -o $@ $< \ - $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) + $(HOST_LOADLIBES) $(HOSTLDLIBS_$(@F)) $(host-csingle): $(obj)/%: $(src)/%.c FORCE $(call if_changed_dep,host-csingle) @@ -95,7 +95,7 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE quiet_cmd_host-cmulti = HOSTLD $@ cmd_host-cmulti = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \ $(addprefix $(obj)/,$($(@F)-objs)) \ - $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) + $(HOST_LOADLIBES) $(HOSTLDLIBS_$(@F)) $(host-cmulti): FORCE $(call if_changed,host-cmulti) $(call multi_depend, $(host-cmulti), , -objs) @@ -113,7 +113,7 @@ quiet_cmd_host-cxxmulti = HOSTLD $@ cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \ $(foreach o,objs cxxobjs,\ $(addprefix $(obj)/,$($(@F)-$(o)))) \ - $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) + $(HOST_LOADLIBES) $(HOSTLDLIBS_$(@F)) $(host-cxxmulti): FORCE $(call if_changed,host-cxxmulti) $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile index 4fb62a60f8..e7af2c98ef 100644 --- a/scripts/imx/Makefile +++ b/scripts/imx/Makefile @@ -4,14 +4,14 @@ hostprogs-$(CONFIG_ARCH_IMX_USBLOADER) += imx-usb-loader always := $(hostprogs-y) HOSTCFLAGS_imx-usb-loader.o = `pkg-config --cflags libusb-1.0` -HOSTLOADLIBES_imx-usb-loader = `pkg-config --libs libusb-1.0` +HOSTLDLIBS_imx-usb-loader = `pkg-config --libs libusb-1.0` HOSTCFLAGS_imx.o = -I$(srctree)/arch/arm/mach-imx/include HOSTCFLAGS_imx-image.o = -I$(srctree) -I$(srctree)/arch/arm/mach-imx/include HOSTCFLAGS_imx-usb-loader.o += -I$(srctree) -I$(srctree)/arch/arm/mach-imx/include ifdef CONFIG_ARCH_IMX_IMXIMAGE_SSL_SUPPORT HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT -HOSTLOADLIBES_imx-image = `pkg-config --libs openssl` +HOSTLDLIBS_imx-image = `pkg-config --libs openssl` endif imx-usb-loader-objs := imx-usb-loader.o imx.o diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ef8e5f99e9..f9203d7f34 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -186,7 +186,7 @@ clean-files += config.pot linux.pot PHONY += $(obj)/dochecklxdialog $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog $(obj)/dochecklxdialog: - $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf) + $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLDLIBS_mconf) always := dochecklxdialog @@ -200,16 +200,16 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) LEX_PREFIX_zconf := zconf YACC_PREFIX_zconf := zconf -HOSTLOADLIBES_qconf = $(KC_QT_LIBS) +HOSTLDLIBS_qconf = $(KC_QT_LIBS) HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` +HOSTLDLIBS_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ -Wno-missing-prototypes -HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) +HOSTLDLIBS_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = $(shell \ +HOSTLDLIBS_nconf = $(shell \ pkg-config --libs menuw panelw ncursesw 2>/dev/null \ || pkg-config --libs menu panel ncurses 2>/dev/null \ || echo "-lmenu -lpanel -lncurses" ) diff --git a/scripts/tegra/Makefile b/scripts/tegra/Makefile index 99aef3fa05..8ebc27ca73 100644 --- a/scripts/tegra/Makefile +++ b/scripts/tegra/Makefile @@ -2,7 +2,7 @@ hostprogs-$(CONFIG_ARCH_TEGRA) += cbootimage always := $(hostprogs-y) -HOSTLOADLIBES_cbootimage = '-lm' +HOSTLDLIBS_cbootimage = '-lm' cbootimage-objs := \ cbootimage.o \ |