diff options
| -rw-r--r-- | meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch | 39 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb (renamed from meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb) | 5 |
2 files changed, 2 insertions, 42 deletions
diff --git a/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch b/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch deleted file mode 100644 index 42d6b290ae..0000000000 --- a/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://github.com/vincentbernat/lldpd/issues/133] | ||
| 2 | |||
| 3 | Subject: [PATCH] fix libevent configure | ||
| 4 | |||
| 5 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 6 | --- | ||
| 7 | m4/libevent.m4 | 4 ++-- | ||
| 8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/m4/libevent.m4 b/m4/libevent.m4 | ||
| 11 | index 275e5a5..dcd3309 100644 | ||
| 12 | --- a/m4/libevent.m4 | ||
| 13 | +++ b/m4/libevent.m4 | ||
| 14 | @@ -45,13 +45,11 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ | ||
| 15 | AC_MSG_ERROR([*** libevent not found]) | ||
| 16 | fi | ||
| 17 | ]) | ||
| 18 | - fi | ||
| 19 | |||
| 20 | if test x"$LIBEVENT_EMBEDDED" != x; then | ||
| 21 | unset LIBEVENT_LIBS | ||
| 22 | LIBEVENT_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include" | ||
| 23 | LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la" | ||
| 24 | - fi | ||
| 25 | |||
| 26 | # Call ./configure in libevent. Need it for make dist... | ||
| 27 | libevent_configure_args="$libevent_configure_args --disable-libevent-regress" | ||
| 28 | @@ -64,6 +62,8 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ | ||
| 29 | libevent_configure_args="$libevent_configure_args --with-pic" | ||
| 30 | libevent_configure_args="$libevent_configure_args --enable-static" | ||
| 31 | lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args]) | ||
| 32 | + fi | ||
| 33 | + fi | ||
| 34 | |||
| 35 | AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x]) | ||
| 36 | AC_SUBST([LIBEVENT_LIBS]) | ||
| 37 | -- | ||
| 38 | 2.1.4 | ||
| 39 | |||
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb index 47d3c38ed0..7d5462625a 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb | |||
| @@ -9,11 +9,10 @@ SRC_URI = "\ | |||
| 9 | http://media.luffy.cx/files/${PN}/${PN}-${PV}.tar.gz \ | 9 | http://media.luffy.cx/files/${PN}/${PN}-${PV}.tar.gz \ |
| 10 | file://lldpd.init.d \ | 10 | file://lldpd.init.d \ |
| 11 | file://lldpd.default \ | 11 | file://lldpd.default \ |
| 12 | file://fix-libevent-configure.patch \ | ||
| 13 | " | 12 | " |
| 14 | 13 | ||
| 15 | SRC_URI[md5sum] = "8cb74065956bc32a575ee5203b0e0fb5" | 14 | SRC_URI[md5sum] = "4e924420e00ccd5dc289506f43221820" |
| 16 | SRC_URI[sha256sum] = "6b50b8aa47d1424a93ba3df55af26da41f7d5718db8d25e99291c4a6cd09c20e" | 15 | SRC_URI[sha256sum] = "aac11cb1fdc037709517372c70c9bf89c752ab8e5eaab9ce140b84ed5a0507c8" |
| 17 | 16 | ||
| 18 | inherit autotools update-rc.d useradd systemd pkgconfig | 17 | inherit autotools update-rc.d useradd systemd pkgconfig |
| 19 | 18 | ||
