Patchwork [CONSOLIDATED,PULL,15/17] wget: enable https and openssl

login
register
mail settings
Submitter Saul Wold
Date Dec. 8, 2011, 8:44 a.m.
Message ID <94eb40ea45e45387d28fc04e3929f1044188b589.1323333676.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/16499/
State Accepted
Commit 852c4b8dcc99aa93e45680c0e42917d7dd202d55
Headers show

Comments

Saul Wold - Dec. 8, 2011, 8:44 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/wget/wget.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Khem Raj - Dec. 9, 2011, 8:21 p.m.
On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com> wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-extended/wget/wget.inc |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> index 91400cc..7083569 100644
> --- a/meta/recipes-extended/wget/wget.inc
> +++ b/meta/recipes-extended/wget/wget.inc
> @@ -2,13 +2,13 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
>  SECTION = "console/network"
>  LICENSE = "GPL"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +DEPENDS = "openssl"
>
> -INC_PR = "r11"
> +INC_PR = "r12"
>
>  inherit autotools gettext update-alternatives
>
> -# Disable checking for SSL since that searches the system paths
> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"

this deserves to be a configurable thing IMO
Steve Sakoman - Dec. 19, 2011, 4:12 a.m.
On Fri, Dec 9, 2011 at 12:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>>  meta/recipes-extended/wget/wget.inc |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
>> index 91400cc..7083569 100644
>> --- a/meta/recipes-extended/wget/wget.inc
>> +++ b/meta/recipes-extended/wget/wget.inc
>> @@ -2,13 +2,13 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
>>  SECTION = "console/network"
>>  LICENSE = "GPL"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>> +DEPENDS = "openssl"
>>
>> -INC_PR = "r11"
>> +INC_PR = "r12"
>>
>>  inherit autotools gettext update-alternatives
>>
>> -# Disable checking for SSL since that searches the system paths
>> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
>> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
>
> this deserves to be a configurable thing IMO

Agreed.  Also, this seems to break the wget build for non x86 processors.

For example, on arm builds the config phase fails:

configure:30042: checking for libssl
configure:30072: ccache arm-poky-linux-gnueabi-gcc  -march=armv7-a
-fno-tree-vectorize      -mthumb-interwork -mfloat-abi=softfp
-mfpu=neon -mtune=cortex-a8
--sysroot=/media/Work/yocto-tmp/sysroots/omap3-multi -o conftest -O2
-pipe -g -feliminate-unused-debug-types  -Wl,-O1 -Wl,--hash-style=gnu
-Wl,--as-needed conftest.c -ldl -lz  -lssl -lcrypto /usr/lib/libz.so
>&5
/usr/lib/libz.so: could not read symbols: File in wrong format

Steve
Dexuan Cui - Dec. 19, 2011, 4:34 a.m.
Steve Sakoman wrote on 2011-12-19:
> On Fri, Dec 9, 2011 at 12:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On Thu, Dec 8, 2011 at 12:44 AM, Saul Wold <sgw@linux.intel.com>
> wrote:
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>> ---
>>>  meta/recipes-extended/wget/wget.inc |    6 +++---
>>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>> 
>>> diff --git a/meta/recipes-extended/wget/wget.inc
>>> b/meta/recipes-extended/wget/wget.inc index 91400cc..7083569 100644
>>> --- a/meta/recipes-extended/wget/wget.inc +++
>>> b/meta/recipes-extended/wget/wget.inc @@ -2,13 +2,13 @@ DESCRIPTION =
>>> "A console URL download utility featuring HTTP, FTP, and more."
>>>  SECTION = "console/network"  LICENSE = "GPL"  LIC_FILES_CHKSUM =
>>> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS =
>>> "openssl"
>>> 
>>> -INC_PR = "r11"
>>> +INC_PR = "r12"
>>> 
>>>  inherit autotools gettext update-alternatives
>>> 
>>> -# Disable checking for SSL since that searches the system paths
>>> -EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
>>> +EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
>> 
>> this deserves to be a configurable thing IMO
> 
> Agreed.  Also, this seems to break the wget build for non x86 processors.
> 
> For example, on arm builds the config phase fails:
> 
> configure:30042: checking for libssl
> configure:30072: ccache arm-poky-linux-gnueabi-gcc  -march=armv7-a
> -fno-tree-vectorize      -mthumb-interwork -mfloat-abi=softfp
> -mfpu=neon -mtune=cortex-a8
> --sysroot=/media/Work/yocto-tmp/sysroots/omap3-multi -o conftest -O2
> -pipe -g -feliminate-unused-debug-types  -Wl,-O1 -Wl,--hash-style=gnu
> -Wl,--as-needed conftest.c -ldl -lz  -lssl -lcrypto /usr/lib/libz.so
>> &5
> /usr/lib/libz.so: could not read symbols: File in wrong format
Hi, Steve,
I found this issue, too.
I've made a patch for this and will send it out soon.

Thanks,
-- Dexuan

Patch

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 91400cc..7083569 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -2,13 +2,13 @@  DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
 SECTION = "console/network"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "openssl"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 inherit autotools gettext update-alternatives
 
-# Disable checking for SSL since that searches the system paths
-EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
+EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
 
 do_install_append () {
 	mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}