proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 18:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debianpkg: remove bad USE_* options, add WERROR

Browse Source 
This strips the USE_PIM, USE_BFD and USE_LDP options, all of which are
just straight up counterproductive knobs.

Instead, --enable-werror really needs to default to off, so add an
option for that.

Lastly, use --disable-dependency-tracking to speed up the build.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2018-10-15 07:03:20 +02:00 committed by David Lamparter
parent 563fbfb307
commit 4108d88478
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
debianpkg/rules
View File

@ -7,15 +7,15 @@
# The following are the defaults. They can be overridden by setting a # The following are the defaults. They can be overridden by setting a
# env variable to a different value # env variable to a different value
WANT_LDP ?= 1 # -Werror - don't enable this unless you're doing a dev package build
WANT_PIM ?= 1 WANT_WERROR ?= 0
WANT_OSPFAPI ?= 1 WANT_OSPFAPI ?= 1
WANT_BGP_VNC ?= 1 WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0 WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1 WANT_MULTIPATH ?= 1
WANT_SNMP ?= 0 WANT_SNMP ?= 0
WANT_RPKI ?= 0 WANT_RPKI ?= 0
WANT_BFD ?= 1
# NOTES: # NOTES:
# #
@ -57,18 +57,6 @@ else
$(warning "DEBIAN: SNMP disabled, see README.Debian") $(warning "DEBIAN: SNMP disabled, see README.Debian")
endif endif
ifeq ($(WANT_LDP), 1)
USE_LDP=--enable-ldpd
else
USE_LDP=--disable-ldpd
endif
ifeq ($(WANT_PIM), 1)
USE_PIM=--enable-pimd
else
USE_PIM=--disable-pimd
endif
ifeq ($(WANT_OSPFAPI), 1) ifeq ($(WANT_OSPFAPI), 1)
USE_OSPFAPI=--enable-ospfapi=yes USE_OSPFAPI=--enable-ospfapi=yes
else else
@ -103,10 +91,10 @@ else
USE_RPKI=--disable-rpki USE_RPKI=--disable-rpki
endif endif
ifeq ($(WANT_BFD), 1) ifeq ($(WANT_WERROR), 1)
USE_BFD=--enable-bfdd USE_WERROR=--enable-werror
else else
USE_BFD=--disable-bfdd USE_WERROR=--disable-werror
endif endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@ -137,21 +125,18 @@ override_dh_auto_configure:
$(USE_SNMP) \ $(USE_SNMP) \
$(USE_OSPFAPI) \ $(USE_OSPFAPI) \
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \
--enable-fpm \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
--enable-configfile-mask=0640 \ --enable-configfile-mask=0640 \
--enable-logfile-mask=0640 \ --enable-logfile-mask=0640 \
--enable-werror \ $(USE_WERROR) \
--with-libpam \ --with-libpam \
--enable-systemd=yes \ --enable-systemd=yes \
$(USE_CUMULUS) \ $(USE_CUMULUS) \
$(USE_PIM) \ --disable-dependency-tracking \
--enable-dependency-tracking \
$(USE_BGP_VNC) \ $(USE_BGP_VNC) \
$(USE_RPKI) \ $(USE_RPKI) \
$(USE_BFD) \
$(shell dpkg-buildflags --export=configure); \ $(shell dpkg-buildflags --export=configure); \
fi fi