[147845] trunk/dports/sysutils/sysdig
g5pw at macports.org
g5pw at macports.org
Sun Apr 17 15:15:28 PDT 2016
Revision: 147845
https://trac.macports.org/changeset/147845
Author: g5pw at macports.org
Date: 2016-04-17 15:15:27 -0700 (Sun, 17 Apr 2016)
Log Message:
-----------
sysutils/sysdig: update to 0.9.0
Update patches to avoid using lua headers if any are installed.
Modified Paths:
--------------
trunk/dports/sysutils/sysdig/Portfile
Added Paths:
-----------
trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff
Removed Paths:
-------------
trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff
trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff
Modified: trunk/dports/sysutils/sysdig/Portfile
===================================================================
--- trunk/dports/sysutils/sysdig/Portfile 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/Portfile 2016-04-17 22:15:27 UTC (rev 147845)
@@ -5,7 +5,7 @@
PortGroup github 1.0
PortGroup cmake 1.0
-github.setup draios sysdig 0.1.89
+github.setup draios sysdig 0.9.0
maintainers g5pw openmaintainer
categories sysutils
description ${name} is an open source system-level exploration and troubleshooting tool.
@@ -25,30 +25,25 @@
license GPL-2
homepage http://www.sysdig.org
-checksums rmd160 44fd872fed9326ce05ae43914f5c48a1b28bc176 \
- sha256 07fe878e733b28aacb7757ba9f75ee0f04a713349974585de20782e572339bee
+checksums rmd160 bbf17f1fecf2e92ff7d376f9af77abc41f32acfb \
+ sha256 6326c3f7c754f96d6f35565736c80f8c7fc72c5f97b61ff9278c8c01c9e3d47f
depends_lib-append port:luajit \
port:zlib \
- port:jsoncpp
+ port:jsoncpp \
+ port:ncurses
+patchfiles patch-force_luajit_headers.diff
+
configure.args-append \
-DUSE_BUNDLED_LUAJIT=OFF \
-DUSE_BUNDLED_JSONCPP=OFF \
- -DUSE_BUNDLED_ZLIB=OFF
+ -DUSE_BUNDLED_ZLIB=OFF \
+ -DUSE_BUNDLED_NCURSES=OFF
# we are building out-of-source
post-extract {
file mkdir ${worksrcpath}/build
}
-# The patch is necessary to ensure the compiler picks up the .h files from
-# luajit and not lua (see https://github.com/draios/sysdig/issues/203)
-patchfiles patch-userspace-libsinsp-chisel.cpp.diff \
- patch-userspace-libsinsp-chisel_api.cpp.diff
-
-configure.args-append \
- ${worksrcpath}
-configure.dir ${worksrcpath}/build
-
-build.dir ${worksrcpath}/build
+cmake.out_of_source yes
Added: trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff
===================================================================
--- trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff (rev 0)
+++ trunk/dports/sysutils/sysdig/files/patch-force_luajit_headers.diff 2016-04-17 22:15:27 UTC (rev 147845)
@@ -0,0 +1,75 @@
+--- userspace/libsinsp/chisel.cpp 2014-06-25 01:41:11.000000000 +0200
++++ userspace/libsinsp/chisel.cpp 2014-07-08 10:29:01.000000000 +0200
+@@ -44,9 +44,9 @@
+ #ifdef HAS_LUA_CHISELS
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+ #endif
+
+--- userspace/libsinsp/chisel_api.cpp 2014-09-25 23:45:57.000000000 +0200
++++ userspace/libsinsp/chisel_api.cpp 2014-10-11 15:24:01.000000000 +0200
+@@ -46,9 +46,9 @@
+
+ #ifdef HAS_LUA_CHISELS
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+ #endif
+
+--- userspace/libsinsp/lua_parser.cpp
++++ userspace/libsinsp/lua_parser.cpp
+@@ -8,9 +8,9 @@
+
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ const static struct luaL_reg ll_filter [] =
+--- userspace/libsinsp/lua_parser_api.cpp
++++ userspace/libsinsp/lua_parser_api.cpp
+@@ -3,9 +3,9 @@
+ #include "lua_parser.h"
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ extern sinsp_filter_check_list g_filterlist;
+--- userspace/libsinsp/lua_parser_api.h
++++ userspace/libsinsp/lua_parser_api.h
+@@ -19,9 +19,9 @@
+ #pragma once
+
+ extern "C" {
+-#include "lua.h"
+-#include "lualib.h"
+-#include "lauxlib.h"
++#include <luajit-2.0/lua.h>
++#include <luajit-2.0/lualib.h>
++#include <luajit-2.0/lauxlib.h>
+ }
+
+ class lua_parser_cbacks
Deleted: trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff
===================================================================
--- trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel.cpp.diff 2016-04-17 22:15:27 UTC (rev 147845)
@@ -1,15 +0,0 @@
---- userspace/libsinsp/chisel.cpp 2014-06-25 01:41:11.000000000 +0200
-+++ userspace/libsinsp/chisel.cpp 2014-07-08 10:29:01.000000000 +0200
-@@ -39,9 +39,9 @@
-
- #ifdef HAS_LUA_CHISELS
- extern "C" {
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include "luajit-2.0/lua.h"
-+#include "luajit-2.0/lualib.h"
-+#include "luajit-2.0/lauxlib.h"
- }
- #endif
-
Deleted: trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff
===================================================================
--- trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff 2016-04-17 19:59:03 UTC (rev 147844)
+++ trunk/dports/sysutils/sysdig/files/patch-userspace-libsinsp-chisel_api.cpp.diff 2016-04-17 22:15:27 UTC (rev 147845)
@@ -1,15 +0,0 @@
---- userspace/libsinsp/chisel_api.cpp 2014-09-25 23:45:57.000000000 +0200
-+++ userspace/libsinsp/chisel_api.cpp 2014-10-11 15:24:01.000000000 +0200
-@@ -40,9 +40,9 @@
-
- #ifdef HAS_LUA_CHISELS
- extern "C" {
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lualib.h>
-+#include <luajit-2.0/lauxlib.h>
- }
- #endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160417/26101a0a/attachment.html>
More information about the macports-changes
mailing list