Merge ~fnordahl/ubuntu/+source/openvswitch:extra-configure-opts into ~ubuntu-server-dev/ubuntu/+source/openvswitch:master

[Frode Nordahl]

In preparing for proposing our packaging sources to the upstream Open vSwitch repository we pick this relevant change made to the upstream packaging sources.

[Christian Ehrhardt  (paelzer)]

Hi Frode, welcome back

LGTM

If you do not mind (to reduce churn later on when merging with Debian) I'm picking this into the to-be-debians-ovs-based-on-ubuntu branches right away.

Unmerged commits

9da33bd... by Frode Nordahl on 2022-06-28

d/rules: Allow use of EXTRA_CONFIGURE_OPTS

Adapted from upstream commit [0].

0: https://github.com/openvswitch/ovs/commit/925a09477

Co-authored-by: Shahar Klein <email address hidden>
Signed-off-by: Frode Nordahl <email address hidden>

diff --git a/debian/rules b/debian/rules
index 8000448..c9f4348 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,14 +25,19 @@ override_dh_auto_configure:
 	cd _debian && ( \
 		test -e Makefile || \
 		../configure --prefix=/usr --localstatedir=/var --enable-ssl \
-					 --sysconfdir=/etc $(DATAPATH_CONFIGURE_OPTS))
+					 --sysconfdir=/etc \
+					 $(DATAPATH_CONFIGURE_OPTS) \
+					 $(EXTRA_CONFIGURE_OPTS) \
+					 )
 ifneq (,$(filter i386 amd64 ppc64el arm64, $(DEB_HOST_ARCH)))
 	test -d _dpdk || mkdir _dpdk
 	cd _dpdk && ( \
 		test -e Makefile || \
         ../configure --prefix=/usr --localstatedir=/var --enable-ssl \
                      --with-dpdk=shared --sysconfdir=/etc \
-					 $(DATAPATH_CONFIGURE_OPTS))
+					 $(DATAPATH_CONFIGURE_OPTS) \
+					 $(EXTRA_CONFIGURE_OPTS) \
+					 )
 endif