net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch

   1 From e81ccb671014db62bf622cd8f960d7930d27d9dc Mon Sep 17 00:00:00 2001
   2 From: Yousong Zhou <yszhou4tech@gmail.com>
   3 Date: Wed, 29 Jul 2020 17:29:14 +0800
   4 Subject: [PATCH] build: only link libopenvswitch with libunwind, libunbound
   5
   6 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
   7 ---
   8  lib/automake.mk          | 2 ++
   9  lib/libopenvswitch.pc.in | 2 +-
  10  m4/openvswitch.m4        | 6 ++++--
  11  3 files changed, 7 insertions(+), 3 deletions(-)
  12
  13 --- a/lib/automake.mk
  14 +++ b/lib/automake.mk
  15 @@ -10,6 +10,8 @@ lib_LTLIBRARIES += lib/libopenvswitch.la
  16  lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
  17  lib_libopenvswitch_la_LIBADD += $(CAPNG_LDADD)
  18  lib_libopenvswitch_la_LIBADD += $(LIBBPF_LDADD)
  19 +lib_libopenvswitch_la_LIBADD += $(LIBUNBOUND_LDADD)
  20 +lib_libopenvswitch_la_LIBADD += $(LIBUNWIND_LDADD)
  21
  22
  23  if WIN32
  24 --- a/lib/libopenvswitch.pc.in
  25 +++ b/lib/libopenvswitch.pc.in
  26 @@ -7,5 +7,5 @@ Name: libopenvswitch
  27  Description: Open vSwitch library
  28  Version: @VERSION@
  29  Libs: -L${libdir} -lopenvswitch
  30 -Libs.private: @LIBS@
  31 +Libs.private: @LIBS@ @SSL_LIBS@ @CAPNG_LDADD@ @LIBBPF_LDADD@ @LIBUNBOUND_LDADD@ @LIBUNWIND_LDADD@
  32  Cflags: -I${includedir}/openvswitch
  33 --- a/m4/openvswitch.m4
  34 +++ b/m4/openvswitch.m4
  35 @@ -657,7 +657,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND],
  36    [AC_CHECK_LIB(unbound, ub_ctx_create, [HAVE_UNBOUND=yes], [HAVE_UNBOUND=no])
  37     if test "$HAVE_UNBOUND" = yes; then
  38       AC_DEFINE([HAVE_UNBOUND], [1], [Define to 1 if unbound is detected.])
  39 -     LIBS="$LIBS -lunbound"
  40 +     LIBUNBOUND_LDADD="-lunbound"
  41 +     AC_SUBST(LIBUNBOUND_LDADD)
  42     fi
  43     AM_CONDITIONAL([HAVE_UNBOUND], [test "$HAVE_UNBOUND" = yes])
  44     AC_SUBST([HAVE_UNBOUND])])
  45 @@ -669,7 +670,8 @@ AC_DEFUN([OVS_CHECK_UNWIND],
  46     [HAVE_UNWIND=no])
  47     if test "$HAVE_UNWIND" = yes; then
  48       AC_DEFINE([HAVE_UNWIND], [1], [Define to 1 if unwind is detected.])
  49 -     LIBS="$LIBS -lunwind"
  50 +     LIBUNWIND_LDADD="-lunwind"
  51 +     AC_SUBST(LIBUNWIND_LDADD)
  52     fi
  53     AM_CONDITIONAL([HAVE_UNWIND], [test "$HAVE_UNWIND" = yes])
  54     AC_SUBST([HAVE_UNWIND])])