matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: put CFLAGS/LDLIBS in config.mk 

This renames Config to config.mk and includes more Make input.
Now configure generates all the required CFLAGS and LDLIBS for
the optional libraries.

Also, use pkg-config to test for libelf, rather than using a test
program. This makes it consistent with other libraries.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-08-10 17:05:03 -07:00
parent 51186362ba
commit 5f1df307b4
14 changed files with 60 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
static-syms.h static-syms.h
config.* config.*
Config
*.o *.o
*.a *.a
*.so *.so

8
Makefile
View File

@ -54,12 +54,12 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
LDLIBS += $(LIBNETLINK) LDLIBS += $(LIBNETLINK)
all: Config all: config.mk
@set -e; \ @set -e; \
for i in $(SUBDIRS); \ for i in $(SUBDIRS); \
do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done
Config: config.mk:
sh configure $(KERNEL_INCLUDE) sh configure $(KERNEL_INCLUDE)
install: all install: all
@ -88,9 +88,9 @@ clean:
do $(MAKE) $(MFLAGS) -C $$i clean; done do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clobber:
touch Config touch config.mk
$(MAKE) $(MFLAGS) clean $(MAKE) $(MFLAGS) clean
rm -f Config cscope.* rm -f config.mk cscope.*
distclean: clobber distclean: clobber

5
README
View File

@ -21,8 +21,9 @@ database routines. Often this is in the db-devel package.
2. make 2. make
The makefile will automatically build a Config file which The makefile will automatically build a config.mk file which
contains whether or not ATM is available, etc. contains definitions of libraries that may or may not be available
on the system such as: ATM, ELF, MNL, and SELINUX.
3. To make documentation, cd to doc/ directory , then 3. To make documentation, cd to doc/ directory , then
look at start of Makefile and set correct values for look at start of Makefile and set correct values for

11
bridge/Makefile
View File

@ -1,15 +1,6 @@
BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
include ../Config include ../config.mk
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: bridge all: bridge

81
configure vendored
View File

@ -3,6 +3,9 @@
# #
INCLUDE=${1:-"$PWD/include"} INCLUDE=${1:-"$PWD/include"}
# Output file which is input to Makefile
CONFIG=config.mk
# Make a temp directory in build tree. # Make a temp directory in build tree.
TMPDIR=$(mktemp -d config.XXXXXX) TMPDIR=$(mktemp -d config.XXXXXX)
trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
@ -10,7 +13,7 @@ trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
check_prog() check_prog()
{ {
echo -n "$2" echo -n "$2"
command -v $1 >/dev/null 2>&1 && (echo "$3:=y" >> Config; echo "yes") || (echo "no"; return 1) command -v $1 >/dev/null 2>&1 && (echo "$3:=y" >> $CONFIG; echo "yes") || (echo "no"; return 1)
} }
check_docs() check_docs()
@ -30,9 +33,9 @@ check_toolchain()
: ${PKG_CONFIG:=pkg-config} : ${PKG_CONFIG:=pkg-config}
: ${AR=ar} : ${AR=ar}
: ${CC=gcc} : ${CC=gcc}
echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config echo "PKG_CONFIG:=${PKG_CONFIG}" >>$CONFIG
echo "AR:=${AR}" >>Config echo "AR:=${AR}" >>$CONFIG
echo "CC:=${CC}" >>Config echo "CC:=${CC}" >>$CONFIG
} }
check_atm() check_atm()
@ -49,7 +52,7 @@ EOF
$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_ATM:=y" >>Config echo "TC_CONFIG_ATM:=y" >>$CONFIG
echo yes echo yes
else else
echo no echo no
@ -61,7 +64,7 @@ check_xtables()
{ {
if ! ${PKG_CONFIG} xtables --exists if ! ${PKG_CONFIG} xtables --exists
then then
echo "TC_CONFIG_NO_XT:=y" >>Config echo "TC_CONFIG_NO_XT:=y" >>$CONFIG
fi fi
} }
@ -90,7 +93,7 @@ EOF
if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \ if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \
$(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1 $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1
then then
echo "TC_CONFIG_XT:=y" >>Config echo "TC_CONFIG_XT:=y" >>$CONFIG
echo "using xtables" echo "using xtables"
fi fi
rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
@ -99,7 +102,7 @@ EOF
check_xt_old() check_xt_old()
{ {
# bail if previous XT checks has already succeded. # bail if previous XT checks has already succeded.
if grep -q TC_CONFIG_XT Config if grep -q TC_CONFIG_XT $CONFIG
then then
return return
fi fi
@ -129,7 +132,7 @@ EOF
$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_XT_OLD:=y" >>Config echo "TC_CONFIG_XT_OLD:=y" >>$CONFIG
echo "using old xtables (no need for xt-internal.h)" echo "using old xtables (no need for xt-internal.h)"
fi fi
rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
@ -138,7 +141,7 @@ EOF
check_xt_old_internal_h() check_xt_old_internal_h()
{ {
# bail if previous XT checks has already succeded. # bail if previous XT checks has already succeded.
if grep -q TC_CONFIG_XT Config if grep -q TC_CONFIG_XT $CONFIG
then then
return return
fi fi
@ -170,14 +173,14 @@ EOF
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "using old xtables with xt-internal.h" echo "using old xtables with xt-internal.h"
echo "TC_CONFIG_XT_OLD_H:=y" >>Config echo "TC_CONFIG_XT_OLD_H:=y" >>$CONFIG
fi fi
rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
} }
check_ipt() check_ipt()
{ {
if ! grep TC_CONFIG_XT Config > /dev/null if ! grep TC_CONFIG_XT $CONFIG > /dev/null
then then
echo "using iptables" echo "using iptables"
fi fi
@ -188,7 +191,7 @@ check_ipt_lib_dir()
IPT_LIB_DIR=$(${PKG_CONFIG} --variable=xtlibdir xtables) IPT_LIB_DIR=$(${PKG_CONFIG} --variable=xtlibdir xtables)
if [ -n "$IPT_LIB_DIR" ]; then if [ -n "$IPT_LIB_DIR" ]; then
echo $IPT_LIB_DIR echo $IPT_LIB_DIR
echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> Config echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> $CONFIG
return return
fi fi
@ -197,7 +200,7 @@ check_ipt_lib_dir()
for file in $dir/{xtables,iptables}/lib*t_*so ; do for file in $dir/{xtables,iptables}/lib*t_*so ; do
if [ -f $file ]; then if [ -f $file ]; then
echo ${file%/*} echo ${file%/*}
echo "IPT_LIB_DIR:=${file%/*}" >> Config echo "IPT_LIB_DIR:=${file%/*}" >> $CONFIG
return return
fi fi
done done
@ -218,8 +221,9 @@ EOF
$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "IP_CONFIG_SETNS:=y" >>Config echo "IP_CONFIG_SETNS:=y" >>$CONFIG
echo "yes" echo "yes"
echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
else else
echo "no" echo "no"
fi fi
@ -249,7 +253,7 @@ EOF
if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1 if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1
then then
echo "TC_CONFIG_IPSET:=y" >>Config echo "TC_CONFIG_IPSET:=y" >>$CONFIG
echo "yes" echo "yes"
else else
echo "no" echo "no"
@ -259,25 +263,16 @@ EOF
check_elf() check_elf()
{ {
cat >$TMPDIR/elftest.c <<EOF if ${PKG_CONFIG} libelf --exists
#include <libelf.h>
#include <gelf.h>
int main(void)
{
Elf_Scn *scn __attribute__((__unused__));
GElf_Shdr shdr __attribute__((__unused__));;
return elf_version(EV_CURRENT);
}
EOF
if $CC -I$INCLUDE -o $TMPDIR/elftest $TMPDIR/elftest.c -lelf >/dev/null 2>&1
then then
echo "HAVE_ELF:=y" >>Config echo "HAVE_ELF:=y" >>$CONFIG
echo "yes" echo "yes"
echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
else else
echo "no" echo "no"
fi fi
rm -f $TMPDIR/elftest.c $TMPDIR/elftest
} }
check_selinux() check_selinux()
@ -285,8 +280,11 @@ check_selinux()
{ {
if ${PKG_CONFIG} libselinux --exists if ${PKG_CONFIG} libselinux --exists
then then
echo "HAVE_SELINUX:=y" >>Config echo "HAVE_SELINUX:=y" >>$CONFIG
echo "yes" echo "yes"
echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
else else
echo "no" echo "no"
fi fi
@ -296,8 +294,11 @@ check_mnl()
{ {
if ${PKG_CONFIG} libmnl --exists if ${PKG_CONFIG} libmnl --exists
then then
echo "HAVE_MNL:=y" >>Config echo "HAVE_MNL:=y" >>$CONFIG
echo "yes" echo "yes"
echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
else else
echo "no" echo "no"
fi fi
@ -317,7 +318,7 @@ EOF
$CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1 $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "HAVE_BERKELEY_DB:=y" >>Config echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
echo "yes" echo "yes"
else else
echo "no" echo "no"
@ -351,8 +352,8 @@ endif
EOF EOF
} }
echo "# Generated config based on" $INCLUDE >Config echo "# Generated config based on" $INCLUDE >$CONFIG
quiet_config >> Config quiet_config >> $CONFIG
check_toolchain check_toolchain
@ -362,7 +363,7 @@ echo -n " ATM "
check_atm check_atm
check_xtables check_xtables
if ! grep -q TC_CONFIG_NO_XT Config if ! grep -q TC_CONFIG_NO_XT $CONFIG
then then
echo -n " IPT " echo -n " IPT "
check_xt check_xt
@ -375,7 +376,7 @@ then
fi fi
echo echo
if ! grep -q TC_CONFIG_NO_XT Config if ! grep -q TC_CONFIG_NO_XT $CONFIG
then then
echo -n "iptables modules directory: " echo -n "iptables modules directory: "
check_ipt_lib_dir check_ipt_lib_dir
@ -401,6 +402,6 @@ echo -n "docs:"
check_docs check_docs
echo echo
echo >> Config echo >> $CONFIG
echo "%.o: %.c" >> Config echo "%.o: %.c" >> $CONFIG
echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> Config echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG

3
devlink/Makefile
View File

@ -1,4 +1,5 @@
include ../Config include ../config.mk
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
DEVLINKOBJ = devlink.o mnlg.o DEVLINKOBJ = devlink.o mnlg.o

7
genl/Makefile
View File

@ -1,6 +1,6 @@
GENLOBJ=genl.o GENLOBJ=genl.o
include ../Config include ../config.mk
SHARED_LIBS ?= y SHARED_LIBS ?= y
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
@ -17,11 +17,6 @@ LDFLAGS += -Wl,-export-dynamic
LDLIBS += -lm -ldl LDLIBS += -lm -ldl
endif endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: genl all: genl
genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB) genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB)

15
ip/Makefile
View File

@ -13,20 +13,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
RTMONOBJ=rtmon.o RTMONOBJ=rtmon.o
include ../Config include ../config.mk
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
ifeq ($(HAVE_ELF),y)
CFLAGS += -DHAVE_ELF
LDLIBS += -lelf
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
ALLOBJ=$(IPOBJ) $(RTMONOBJ) ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef SCRIPTS=ifcfg rtpr routel routef

14
lib/Makefile
View File

@ -1,16 +1,4 @@
include ../Config include ../config.mk
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
ifeq ($(HAVE_ELF),y)
CFLAGS += -DHAVE_ELF
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
endif
CFLAGS += -fPIC CFLAGS += -fPIC

16
misc/Makefile
View File

@ -3,26 +3,12 @@ LNSTATOBJ=lnstat.o lnstat_util.o
TARGETS=ss nstat ifstat rtacct lnstat TARGETS=ss nstat ifstat rtacct lnstat
include ../Config include ../config.mk
ifeq ($(HAVE_BERKELEY_DB),y) ifeq ($(HAVE_BERKELEY_DB),y)
TARGETS += arpd TARGETS += arpd
endif endif
ifeq ($(HAVE_SELINUX),y)
LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libselinux) -DHAVE_SELINUX
endif
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: $(TARGETS) all: $(TARGETS)
ss: $(SSOBJ) ss: $(SSOBJ)

7
netem/Makefile
View File

@ -1,4 +1,4 @@
include ../Config include ../config.mk
DISTGEN = maketable normal pareto paretonormal DISTGEN = maketable normal pareto paretonormal
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
@ -7,11 +7,6 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm LDLIBS += -lm
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
all: $(DISTGEN) $(DISTDATA) all: $(DISTGEN) $(DISTDATA)
$(DISTGEN): $(DISTGEN):

5
rdma/Makefile
View File

@ -1,13 +1,10 @@
include ../Config include ../config.mk
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
RDMA_OBJ = rdma.o utils.o dev.o link.o RDMA_OBJ = rdma.o utils.o dev.o link.o
TARGETS=rdma TARGETS=rdma
CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif endif
all: $(TARGETS) $(LIBS) all: $(TARGETS) $(LIBS)

15
tc/Makefile
View File

@ -2,11 +2,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \
tc_exec.o m_police.o m_estimator.o m_action.o m_ematch.o \ tc_exec.o m_police.o m_estimator.o m_action.o m_ematch.o \
emp_ematch.yacc.o emp_ematch.lex.o emp_ematch.yacc.o emp_ematch.lex.o
include ../Config include ../config.mk
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
endif
SHARED_LIBS ?= y SHARED_LIBS ?= y
@ -102,15 +98,6 @@ endif
TCOBJ += $(TCMODULES) TCOBJ += $(TCMODULES)
LDLIBS += -L. -lm LDLIBS += -L. -lm
ifeq ($(HAVE_ELF),y)
CFLAGS += -DHAVE_ELF
LDLIBS += -lelf
endif
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
ifeq ($(SHARED_LIBS),y) ifeq ($(SHARED_LIBS),y)
LDLIBS += -ldl LDLIBS += -ldl
LDFLAGS += -Wl,-export-dynamic LDFLAGS += -Wl,-export-dynamic

5
tipc/Makefile
View File

@ -1,4 +1,5 @@
include ../Config include ../config.mk
ifeq ($(HAVE_MNL),y) ifeq ($(HAVE_MNL),y)
TIPCOBJ=bearer.o \ TIPCOBJ=bearer.o \
@ -8,8 +9,6 @@ TIPCOBJ=bearer.o \
node.o socket.o \ node.o socket.o \
peer.o tipc.o peer.o tipc.o
include ../Config
TARGETS=tipc TARGETS=tipc
CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags) CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs) LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)