[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tracebox/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tracebox/files/

[Jeroen Roovers]

commit:     4954ea77ad7c979968e8542e23e41c559975f4d3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 10:42:00 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 10:42:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4954ea77

net-analyzer/tracebox: Fix building against dev-lang/lua:0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Closes: https://bugs.gentoo.org/732728
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
index cb47ad0d2ac..43c0132a49a 100644
--- a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
@@ -9,7 +9,7 @@
  AX_CXX_COMPILE_STDCXX_11
  
  # Checks for header files.
-@@ -32,40 +34,13 @@
+@@ -32,40 +34,14 @@
  AC_FUNC_FORK
  AC_CHECK_FUNCS([gettimeofday memset select socket strtol])
  
@@ -47,17 +47,18 @@
 -        fi
 -    ]
 -)
-+PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
-+PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
-+PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
++PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
++PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
 +
-+if test -z "$LUA_INCLUDE" -o -z "$LUA_LIB"; then
++if test -z "$LUA_FOUND"; then
 +     AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required])
 +fi
  AC_SUBST(LUA_INCLUDE)
  AC_SUBST(LUA_LIB)
  
-@@ -121,24 +96,12 @@
+@@ -121,24 +97,12 @@
  AC_ARG_WITH(json,
  [  --with-json=DIR      use json-c in DIR],
  [ case "$withval" in
@@ -84,7 +85,7 @@
       AC_SUBST(JSON_INCLUDE)
       AC_SUBST(JSON_LIB)
       AC_DEFINE([HAVE_JSONC], [1], [Using json-c])
-@@ -153,41 +116,7 @@
+@@ -153,41 +117,7 @@
      ]
  )
  
@@ -127,7 +128,7 @@
  AC_SUBST(PCAPINC)
  AC_SUBST(PCAPLIB)
  
-@@ -234,17 +163,7 @@
+@@ -234,17 +164,7 @@
      AC_CHECK_LIB([pthread], [pthread_create])
  ])
  
@@ -146,7 +147,7 @@
  
  # Enable click submodule
  AS_IF([test "x$enable_tests" = "xyes"], [
-@@ -254,7 +173,6 @@
+@@ -254,7 +174,6 @@
  
      AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
      AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tracebox/files/

[David Seifert]

commit:     26f70addf68e90272bb071a57a320a1869b6e98f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 12 13:35:12 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 13:35:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f70add

net-analyzer/tracebox: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/18616
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../tracebox/files/tracebox-0.2-deps.patch         | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch b/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
deleted file mode 100644
index f6c748a410c..00000000000
--- a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,15 +32,11 @@
- 	])
- ])
- 
--# Make sure libcrafter build a static library by adding the --disable-shared
--# argument to the configure script.
--ac_configure_args_pre="$ac_configure_args"
--ac_configure_args_post="$ac_configure_args --disable-shared"
--ac_configure_args="$ac_configure_args_post"
-+# check for libcrafter
-+PKG_CHECK_MODULES(crafter, crafter, LIBS="$LIBS $crafter_LIBS",AC_MSG_ERROR([libcrafter is required]))
- 
--AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
--AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter)
-+# check for libpcap
-+AC_CHECK_LIB(pcap,pcap_open_offline,LIBS="$LIBS -lpcap",AC_MSG_ERROR([libpcap is required]))
- 
- # Enable click submodule
- AS_IF([test "x$enable_tests" = "xyes"], [
-@@ -50,7 +46,6 @@
- 
- 	AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
- 	AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--	AC_CONFIG_SUBDIRS(tests/tools/click)
- 
- 	AC_PATH_PROG([FAKEROOT], [fakeroot])
- 	AS_IF([test -z "$FAKEROOT"], [