From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Tue, 8 Nov 2016 22:45:31 +0100 Subject: [Buildroot] [PATCH 1/2] wget: fix ssl detection in static libs configuration In-Reply-To: <1478630202-1630-1-git-send-email-rahul.bedarkar@imgtec.com> References: <1478630202-1630-1-git-send-email-rahul.bedarkar@imgtec.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 08-11-16 19:36, Rahul Bedarkar wrote: > When building wget with openssl in static libs configuration, wget > build system fails detect openssl because it doesn't specify LD flags to > for private libs used by openssl. This specifically happens when we > pass --with-libssl-prefix to configure which tries to find ssl using > custom flags. If we don't specify --with-libssl-prefix, it relies on > pkg-config files to detect ssl and it's LD flags which helps with static > linking. Interesting point to note: the --with-libssl-prefix dates from a time when it didn't have pkg-config support yet. It should have been removed when pkg-config support was added, with the bump to 1.16.1. > > This commit removes --with-libssl-prefix conf opts. Since this case is > similar to gnutls, we remove same conf opts for gnutls as well. > > wget can be built with either gnutls or openssl crypto libraries, so > separate optional support for both is not required. This commit also > does minor optimization by checking for either gnutls or openssl while > at it. That really should have been a separate patch, but OK. Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Regards, Arnout > > Fixes: > http://autobuild.buildroot.net/results/c6a/c6abdff37b86471cf8b0ceffeff5472042923de0/ > > Signed-off-by: Rahul Bedarkar > --- > package/wget/wget.mk | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 9cda76b..c9efc03 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -17,26 +17,17 @@ WGET_DEPENDENCIES += busybox > endif > > ifeq ($(BR2_PACKAGE_GNUTLS),y) > -WGET_CONF_OPTS += \ > - --with-ssl=gnutls \ > - --with-libgnutls-prefix=$(STAGING_DIR) > +WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > -endif > - > -ifeq ($(BR2_PACKAGE_OPENSSL),y) > -WGET_CONF_OPTS += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR) > +else ifeq ($(BR2_PACKAGE_OPENSSL),y) > +WGET_CONF_OPTS += --with-ssl=openssl > WGET_DEPENDENCIES += openssl > +else > +WGET_CONF_OPTS += --without-ssl > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) > WGET_DEPENDENCIES += util-linux > endif > > -# --with-ssl is default > -ifneq ($(BR2_PACKAGE_GNUTLS),y) > -ifneq ($(BR2_PACKAGE_OPENSSL),y) > -WGET_CONF_OPTS += --without-ssl > -endif > -endif > - > $(eval $(autotools-package)) > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF