diff options
| -rw-r--r-- | meta-networking/recipes-support/ntop/ntop/embed-libs.patch | 20 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ntop/ntop_5.0.1.bb | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/ntop/ntop/embed-libs.patch b/meta-networking/recipes-support/ntop/ntop/embed-libs.patch new file mode 100644 index 0000000000..2d1ab73717 --- /dev/null +++ b/meta-networking/recipes-support/ntop/ntop/embed-libs.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | Use --embed option so that it can return libpython as well | ||
| 2 | |||
| 3 | % ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs --embed | ||
| 4 | -lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -lm | ||
| 5 | [kraj@apollo /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/ntop/5.0.1-r0/ntop-5.0.1] | ||
| 6 | % ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs | ||
| 7 | -lcrypt -lpthread -ldl -lutil -lm -lm | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- a/configure.in | ||
| 11 | +++ b/configure.in | ||
| 12 | @@ -1463,7 +1463,7 @@ dnl> | ||
| 13 | fi | ||
| 14 | |||
| 15 | if test "x$PYTHON_CONFIG" != "x"; then | ||
| 16 | - PYTHON_LIBS="`$PYTHON_CONFIG --libs`" | ||
| 17 | + PYTHON_LIBS="`$PYTHON_CONFIG --libs --embed`" | ||
| 18 | if test "x$PYTHON_LIBS" = "x"; then | ||
| 19 | AC_MSG_RESULT(Python[-devel] support is present but misconfigured) | ||
| 20 | else | ||
diff --git a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb index 2d37969a70..d835e399b3 100644 --- a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb | |||
| @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ | |||
| 19 | file://0001-nDPI-Include-sys-types.h.patch \ | 19 | file://0001-nDPI-Include-sys-types.h.patch \ |
| 20 | file://0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch \ | 20 | file://0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch \ |
| 21 | file://fix-missing-return-from-non-void-function.patch \ | 21 | file://fix-missing-return-from-non-void-function.patch \ |
| 22 | file://embed-libs.patch \ | ||
| 22 | " | 23 | " |
| 23 | SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" | 24 | SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" |
| 24 | SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" | 25 | SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" |
| @@ -35,7 +36,7 @@ PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snm | |||
| 35 | --disable-snmp,net-snmp," | 36 | --disable-snmp,net-snmp," |
| 36 | PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," | 37 | PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," |
| 37 | 38 | ||
| 38 | EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" | 39 | EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no PYTHON_CONFIG=python3-config" |
| 39 | 40 | ||
| 40 | do_configure() { | 41 | do_configure() { |
| 41 | cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in | 42 | cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in |
