| Message ID | 20131115144528.GA1086@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Andrew, On 15 November 2013 14:45, Andrew Ruder <andrew.ruder@elecsyscorp.com> wrote: > Simon, > > I mistakingly left you off the original e-mail. Any chance you could > review the sanity of this patch? I'm not actually using wvstreams, so don't have a strong opinion on the change, but your patch looks correct to me. Simon.
diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk index b4f7d89..41155a7 100644 --- a/package/wvstreams/wvstreams.mk +++ b/package/wvstreams/wvstreams.mk @@ -22,7 +22,8 @@ WVSTREAMS_CONF_OPT += \ --with-openssl \ --with-zlib \ --without-pam \ - --disable-warnings + --disable-warnings \ + --without-tcl # needed for openssl detection when statically linking (as ssl needs lz) WVSTREAMS_CONF_ENV += LIBS=-lz @@ -38,13 +39,6 @@ else WVSTREAMS_CONF_OPT += --without-dbus endif -ifeq ($(BR2_PACKAGE_TCL),y) - WVSTREAMS_DEPENDENCIES += tcl - WVSTREAMS_CONF_OPT += --with-tcl -else - WVSTREAMS_CONF_OPT += --without-tcl -endif - ifeq ($(BR2_PACKAGE_QT),y) WVSTREAMS_DEPENDENCIES += qt WVSTREAMS_CONF_OPT += --with-qt
Simon, I mistakingly left you off the original e-mail. Any chance you could review the sanity of this patch? As best as I can tell, the TCL support is some holdover from an earlier version of wvstreams (I can't find any references to the HAVE_TCL_H and friends in the source code) and never linked properly anyway as wvstreams only looks for tcl 8.3. I only came across it as I am trying to bump tcl and started looking at packages with tcl dependencies and found this one. I actually have a similar patch that fixes it to find/link against tcl 8.4 or tcl 8.6 but that's when I started digging around to see what it actually changed in the source code and never could find anything and went with this patch instead. Thanks, Andy ---------- As far as I can tell enabling tcl support has no affect on the actual library. Furthermore, wvstreams has been checking for/linking against tcl 8.3 which has never been supported in buildroot as far as I can tell (8.4 added in 2005). That being said there is clearly no reason to keep this around. Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> --- On a side-note, I am testing a few bigger patches to get expect 5.45 and tcl 8.6.1 added/bumped. I haven't done a decent amount of testing, but figured I'd get some of the smaller patches out of the way as I go. package/wvstreams/wvstreams.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)