Skip to contentSkip to conversation

wvstreams: Cleaned up recipe.

PATCH In review Søren Holm 2 participants 4 messages Apr 25, 2011 – Apr 26, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wvstreams: Cleaned up recipe.

* Corrected license.
* Added dbus support.
* Made PAM-support conditional.

---
 recipes/wvstreams/wvstreams_4.6.1.bb |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
recipes/wvstreams/wvstreams_4.6.1.bb +7 -14
index 53249d4..8453e08 100644
@@ -1,9 +1,10 @@
 HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1"
 DESCRIPTION = "WvStreams is a network programming library in C++"
-DEPENDS = "zlib openssl (>= 0.9.8)"
+DEPENDS = "zlib openssl dbus"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
 	file://0001-Fixed-missing-header-includes.patch \
@@ -13,13 +14,10 @@ inherit autotools pkgconfig
 
 LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
 
-# dbus detection currently broken in configure.ac; remember to add "dbus (>= 1.2.14)" to DEPENDS  when fixed
-EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-dbus"
+EXTRA_OECONF = " --without-tcl --without-qt --with-dbus"
+EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}
 
-PACKAGES_prepend = "libuniconf libuniconf-dbg "
-PACKAGES_prepend = "uniconfd uniconfd-dbg "
-PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
-PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
+PACKAGES += "libuniconf libuniconf-dbg uniconfd uniconfd-dbg libwvstreams-base libwvstreams-base-dbg libwvstreams-extras libwvstreams-extras-dbg"
 
 FILES_libuniconf     = "${libdir}/libuniconf.so.*"
 FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"
@@ -35,10 +33,5 @@ FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu
 
 PARALLEL_MAKE = ""
 
-do_configure() {
-        autoreconf
-        oe_runconf
-}
-
 SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"
Signature · 1 line
1.7.1
#1 lore raw

I forgot

Mandag 25 april 2011 21:34:48 skrev Søren Holm:

Quoted 59 lines

* Corrected license.
* Added dbus support.
* Made PAM-support conditional.

---
 recipes/wvstreams/wvstreams_4.6.1.bb |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
(quoted diff) +0 -0

b/recipes/wvstreams/wvstreams_4.6.1.bb index 53249d4..8453e08 100644

recipes/wvstreams/wvstreams_4.6.1.bb +4 -4
@@ -1,9 +1,10 @@
 HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1"
 DESCRIPTION = "WvStreams is a network programming library in C++"
-DEPENDS = "zlib openssl (>= 0.9.8)"
+DEPENDS = "zlib openssl dbus"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
 	file://0001-Fixed-missing-header-includes.patch \
@@ -13,13 +14,10 @@ inherit autotools pkgconfig
 
 LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
 
-# dbus detection currently broken in configure.ac; remember to add "dbus

(>= 1.2.14)" to DEPENDS when fixed -EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-dbus" +EXTRA_OECONF = " --without-tcl --without-qt --with-dbus"
+EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}

recipes/wvstreams/wvstreams_4.6.1.bb +1 -4
-PACKAGES_prepend = "libuniconf libuniconf-dbg "
-PACKAGES_prepend = "uniconfd uniconfd-dbg "
-PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
-PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
+PACKAGES += "libuniconf libuniconf-dbg uniconfd uniconfd-dbg

libwvstreams-base libwvstreams-base-dbg libwvstreams-extras libwvstreams-extras-dbg"

FILES_libuniconf = "${libdir}/libuniconf.so.*"
FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"

recipes/wvstreams/wvstreams_4.6.1.bb +0 -0
@@ -35,10 +33,5 @@ FILES_libwvstreams-extras-dbg =

"${libdir}/.debug/libwvbase.so.* ${libdir}/.debu

PARALLEL_MAKE = ""

recipes/wvstreams/wvstreams_4.6.1.bb +0 -5
-do_configure() {
-        autoreconf
-        oe_runconf
-}
-
 SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] =

"8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"

Signature · 1 line
Søren Holm
#2 lore raw
In reply to Søren Holm

Dear Søren,

Am Montag, den 25.04.2011, 21:34 +0200 schrieb Søren Holm:

Quoted 2 lines

* Corrected license.
* Added dbus support.

at least the addition DBus support is not a clean up in my opinion and should be an extra patch.

Quoted 1 line

* Made PAM-support conditional.

I would make a commit/patch for each change, but other developers disagree with me in that point.

Quoted 40 lines
---
 recipes/wvstreams/wvstreams_4.6.1.bb |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
recipes/wvstreams/wvstreams_4.6.1.bb +7 -9
index 53249d4..8453e08 100644
@@ -1,9 +1,10 @@
 HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2.1"
 DESCRIPTION = "WvStreams is a network programming library in C++"
-DEPENDS = "zlib openssl (>= 0.9.8)"
+DEPENDS = "zlib openssl dbus"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
 	file://0001-Fixed-missing-header-includes.patch \
@@ -13,13 +14,10 @@ inherit autotools pkgconfig
 
 LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
 
-# dbus detection currently broken in configure.ac; remember to add "dbus (>= 1.2.14)" to DEPENDS  when fixed
-EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-dbus"
+EXTRA_OECONF = " --without-tcl --without-qt --with-dbus"
+EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}
 
-PACKAGES_prepend = "libuniconf libuniconf-dbg "
-PACKAGES_prepend = "uniconfd uniconfd-dbg "
-PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
-PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg "
+PACKAGES += "libuniconf libuniconf-dbg uniconfd uniconfd-dbg libwvstreams-base libwvstreams-base-dbg libwvstreams-extras libwvstreams-extras-dbg"
 
 FILES_libuniconf     = "${libdir}/libuniconf.so.*"
 FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*"

recipes/wvstreams/wvstreams_4.6.1.bb FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu · line 42

Quoted 8 lines
recipes/wvstreams/wvstreams_4.6.1.bb +0 -5
@@ -35,10 +33,5 @@ FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu
 
 PARALLEL_MAKE = ""
 
-do_configure() {
-        autoreconf
-        oe_runconf
-}
-

Can you think of a reason, why Khem did not use the default autotools configure when adding the recipe? I am adding him to CC.

recipes/wvstreams/wvstreams_4.6.1.bb FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu · line 37

Quoted 2 lines
recipes/wvstreams/wvstreams_4.6.1.bb +0 -0
 SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"

Thanks,

Paul

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=6cb210accf55894d2bee00260c2bcc83ab3440c0

#3 lore raw

Tirsdag 26 april 2011 10:10:10 skrev Paul Menzel:

Quoted 3 lines

at least the addition DBus support is not a clean up in my opinion and should be an extra patch.

True, but then again adding it as three patches would yield the same result in the end, so it might have been better to keep wvstreams_4.6.0 also, for cases when 4.6.1+dbus would hurt.

Quoted 5 lines
Quoted 2 lines

* Made PAM-support conditional.

I would make a commit/patch for each change, but other developers disagree with me in that point.

I see your point.

Quoted 4 lines

Can you think of a reason, why Khem did not use the default autotools configure when adding the recipe? I am adding him to CC.

No.

Signature · 1 line
Søren Holm