diff options
| author |   Slawomir Lis <slis@gentoo.org> | 2018-01-22 21:58:13 +0100 |
|---|---|---|
| committer | Slawomir Lis <slis@gentoo.org> | 2018-01-22 22:00:31 +0100 |
| commit | 4be97ce39a9d65edcad5b2f06eadfc25653a7199 (patch) | |
| tree | 705d68262adc6d63baed8cac8c61e6ced1031b81 /net-libs | |
| parent | net-analyzer/ntopng: added sys-libs/binutils-libs dependency (diff) | |
| download | gentoo-4be97ce39a9d65edcad5b2f06eadfc25653a7199.tar.gz gentoo-4be97ce39a9d65edcad5b2f06eadfc25653a7199.tar.bz2 gentoo-4be97ce39a9d65edcad5b2f06eadfc25653a7199.zip | |
net-libs/nDPI: fixes problem with libcache.h
This particular file is later used in building net-analyzer/ntopng,
but it's placed in a third-party folder in nDPI package.
This commit changes this library location.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/nDPI/files/nDPI-2.2-libcache-include.patch | 32 | ||||
| -rw-r--r-- | net-libs/nDPI/nDPI-2.2.ebuild | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch new file mode 100644 index 000000000000..5ee089f46bf3 --- /dev/null +++ b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch @@ -0,0 +1,32 @@ +--- src/include/Makefile.am.orig 2018-01-22 21:24:17.802100061 +0100 ++++ src/include/Makefile.am 2018-01-22 21:24:30.080100801 +0100 +@@ -7,4 +7,5 @@ + ndpi_protocol_ids.h \ + ndpi_protocols.h \ + ndpi_win32.h \ +- ndpi_includes.h ++ ndpi_includes.h \ ++ libcache.h +--- src/include/ndpi_typedefs.h.orig 2018-01-22 21:27:35.994112009 +0100 ++++ src/include/ndpi_typedefs.h 2018-01-22 21:27:47.463112701 +0100 +@@ -25,7 +25,7 @@ + #define __NDPI_TYPEDEFS_H__ + + #include "ndpi_define.h" +-#include "../lib/third_party/include/libcache.h" ++#include "libcache.h" + + #define BT_ANNOUNCE + #define SNAP_EXT +--- src/lib/Makefile.am.orig 2018-01-22 21:34:57.055138600 +0100 ++++ src/lib/Makefile.am 2018-01-22 21:35:10.431139406 +0100 +@@ -12,7 +12,8 @@ + ../include/ndpi_includes.h \ + ../include/ndpi_protocol_ids.h \ + ../include/ndpi_protocols.h \ +- ../include/ndpi_typedefs.h ++ ../include/ndpi_typedefs.h \ ++ ../include/libcache.h + + libndpi_la_SOURCES = ndpi_content_match.c.inc \ + ndpi_main.c \ diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild index 5db72a26125d..6c0160ff6cd8 100644 --- a/net-libs/nDPI/nDPI-2.2.ebuild +++ b/net-libs/nDPI/nDPI-2.2.ebuild @@ -20,6 +20,9 @@ RDEPEND="${DEPEND}" src_prepare() { sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die + mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include" + epatch "${FILESDIR}/${P}-libcache-include.patch" + default eautoreconf } |