Skip to contentSkip to conversation

libevent: control openssl support via PACKAGECONFIG

PATCH New Andre McCurdy 1 participant 2 messages Apr 4, 2015

lore
Share & tools
lore

Andre McCurdy

author
#0 lore raw

PATCH 1/2 libevent: control openssl support via PACKAGECONFIG

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-support/libevent/libevent_2.0.21.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-support/libevent/libevent_2.0.21.bb +2 -1
index 1230e92..e198f09 100644
@@ -18,7 +18,8 @@ SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469
 
 S = "${WORKDIR}/${BPN}-${PV}-stable"
 
-EXTRA_OECONF = "--disable-openssl"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
 
 inherit autotools
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 libevent: update 2.0.21 -> 2.0.22

Signed-off-by Andre McCurdy <[email protected]>
---
 .../libevent/libevent-2.0.21/disable_tests.patch          | 15 ---------------
 .../libevent-2.0.21/obsolete_automake_macros.patch        | 15 ---------------
 .../libevent/{libevent_2.0.21.bb => libevent_2.0.22.bb}   | 11 +++--------
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch
 delete mode 100644 meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch
 rename meta/recipes-support/libevent/{libevent_2.0.21.bb => libevent_2.0.22.bb} (61%)
meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch deleted +0 -15
deleted file mode 100644
index 5d2c690..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libevent-2.0.21-stable/test/Makefile.am libevent-2.0.21-stable/test/Makefile.am
---- libevent-2.0.21-stable/test/Makefile.am	2012-05-31 07:08:19.000000000 +0300
-+++ libevent-2.0.21-stable/test/Makefile.am	2013-02-08 02:06:20.227475872 +0200
-@@ -19,8 +19,6 @@
- EXTRA_PROGRAMS = regress
- noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
-
--TESTS = $(top_srcdir)/test/test.sh
--
- BUILT_SOURCES =
- if BUILD_REGRESS
- BUILT_SOURCES += regress.gen.c regress.gen.h
meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index b559232..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3603774&group_id=50884&atid=461322]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libevent-2.0.21-stable/configure.in libevent-2.0.21-stable/configure.in
---- libevent-2.0.21-stable/configure.in	2012-11-18 08:34:13.000000000 +0200
-+++ libevent-2.0.21-stable/configure.in	2013-02-08 02:03:58.403476183 +0200
-@@ -12,7 +12,7 @@
- AC_CONFIG_MACRO_DIR([m4])
-
- AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
-
- dnl Initialize prefix.
meta/recipes-support/libevent/libevent_2.0.22.bb renamed from meta/recipes-support/libevent/libevent_2.0.21.bb +3 -8
similarity index 61%
rename from meta/recipes-support/libevent/libevent_2.0.21.bb
rename to meta/recipes-support/libevent/libevent_2.0.22.bb
index e198f09..3f9475e 100644
@@ -6,15 +6,10 @@ SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
 
-PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \
-           file://obsolete_automake_macros.patch \
-           file://disable_tests.patch \
-"
-
-SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
-SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
+SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11"
+SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3"
 
 S = "${WORKDIR}/${BPN}-${PV}-stable"
Signature · 1 line
1.9.1