libnl: bump to 3.4.0

[openwrt/staging/wigyori.git] / package / libs / libnl / patches / 102-revert-build-enable-building-cli-during-tests.patch

diff --git a/package/libs/libnl/patches/102-revert-build-enable-building-cli-during-tests.patch b/package/libs/libnl/patches/102-revert-build-enable-building-cli-during-tests.patch
index f715bb83f9dcf15c7d4d70c8d54a5b685dcf1bda..11d9f9bdb2ad30fc567e9892d927e25bcb43f2a2 100644 (file)
--- a/package/libs/libnl/patches/102-revert-build-enable-building-cli-during-tests.patch
+++ b/package/libs/libnl/patches/102-revert-build-enable-building-cli-during-tests.patch
@@ -26,8 +26,6 @@ Upstream status: https://github.com/thom311/libnl/pull/141
  Makefile.am | 21 ++++++---------------
  1 file changed, 6 insertions(+), 15 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 1b95a559304f..279548394650 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -3,8 +3,6 @@
@@ -39,7 +37,7 @@ index 1b95a559304f..279548394650 100644
  
  check_PROGRAMS =
  check_programs =
-@@ -500,6 +498,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES = \
+@@ -511,6 +509,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES =
  lib_libnl_xfrm_3_la_LIBADD = \
        lib/libnl-3.la
  
@@ -48,7 +46,7 @@ index 1b95a559304f..279548394650 100644
  lib_cli_ltlibraries_cls = \
        lib/cli/cls/basic.la \
        lib/cli/cls/cgroup.la
-@@ -513,15 +513,11 @@ lib_cli_ltlibraries_qdisc = \
+@@ -524,15 +524,11 @@ lib_cli_ltlibraries_qdisc = \
        lib/cli/qdisc/pfifo.la \
        lib/cli/qdisc/plug.la
  
@@ -58,19 +56,15 @@ index 1b95a559304f..279548394650 100644
  pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls)
  pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc)
 -else
--noinst_LTLIBRARIES += \
+-check_LTLIBRARIES += \
 -      $(lib_cli_ltlibraries_cls) \
 -      $(lib_cli_ltlibraries_qdisc)
 +
  endif
  
  lib_cli_ldflags = \
-@@ -550,13 +546,8 @@ lib_cli_qdisc_plug_la_LDFLAGS       = $(lib_cli_ldflags)
+@@ -565,9 +561,6 @@ src_lib_ldflags =
  
- ###############################################################################
- 
--src_lib_ldflags =
--
  if ENABLE_CLI
  lib_LTLIBRARIES += src/lib/libnl-cli-3.la
 -src_lib_ldflags += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -79,7 +73,7 @@ index 1b95a559304f..279548394650 100644
  endif
  
  src_lib_libnl_cli_3_la_SOURCES = \
-@@ -583,7 +574,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \
+@@ -594,7 +587,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \
        -I$(srcdir)/include \
        -I$(builddir)/include
  src_lib_libnl_cli_3_la_LDFLAGS = \
@@ -88,7 +82,7 @@ index 1b95a559304f..279548394650 100644
        -Wl,--version-script=$(srcdir)/libnl-cli-3.sym
  src_lib_libnl_cli_3_la_LIBADD = \
        lib/libnl-3.la \
-@@ -668,8 +659,6 @@ else
+@@ -679,8 +672,6 @@ else
  noinst_PROGRAMS += $(cli_programs)
  endif
  endif
@@ -97,7 +91,7 @@ index 1b95a559304f..279548394650 100644
  endif
  
  src_genl_ctrl_list_CPPFLAGS =       $(src_cppflags)
-@@ -847,10 +836,12 @@ tests_test_complex_HTB_with_hash_filters_LDADD    = $(tests_ldadd)
+@@ -858,10 +849,12 @@ tests_test_complex_HTB_with_hash_filters
  tests_test_u32_filter_with_actions_CPPFLAGS       = $(tests_cppflags)
  tests_test_u32_filter_with_actions_LDADD          = $(tests_ldadd)
  
@@ -110,6 +104,3 @@ index 1b95a559304f..279548394650 100644
  
  tests_cli_ldadd = \
        $(tests_ldadd) \
--- 
-2.11.0
-