deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

iproute2: use @D instead of IPROUTE2_DIR

Browse source 
We more generally use $(@D) instead of $(pkg_DIR) to refer to the
package source directory, so this commit updates iproute2 to also use
$(@D) everywhere.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2016-08-05 19:08:00 +02:00
parent 9202490282
commit 40c69fc5b5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/iproute2/iproute2.mk
View file

@ -27,13 +27,13 @@ ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx)
IPROUTE2_DEPENDENCIES += iptables
define IPROUTE2_WITH_IPTABLES
# Makefile is busted so it never passes IPT_LIB_DIR properly
$(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile
$(SED) "s/-DIPT/-DXT/" $(@D)/tc/Makefile
endef
else
define IPROUTE2_WITH_IPTABLES
# em_ipset needs xtables, but configure misdetects it
echo "TC_CONFIG_IPSET:=n" >>$(IPROUTE2_DIR)/Config
echo "TC_CONFIG_XT:=n" >>$(IPROUTE2_DIR)/Config
echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config
echo "TC_CONFIG_XT:=n" >>$(@D)/Config
endef
endif
@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
IPROUTE2_DEPENDENCIES += berkeleydb
else
define IPROUTE2_DISABLE_ARPD
echo "HAVE_BERKELEY_DB:=n" >> $(IPROUTE2_DIR)/Config
echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config
endef
endif