[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Waldemar Brodkorb]

As all librt and libpthread functions are integrated into
libc for a while, workaround no longer required.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/squid/squid.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 976ce6d..bcb3744 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -50,11 +50,6 @@ else
 SQUID_CONF_ENV += squid_cv_gnu_atomics=no
 endif
 
-# On uClibc librt needs libpthread
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
-SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
-endif
-
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
-- 
2.1.4

[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Arnout Vandecappelle]

On 27-06-17 21:06, Waldemar Brodkorb wrote:
> As all librt and libpthread functions are integrated into
> libc for a while, workaround no longer required.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/squid/squid.mk | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> index 976ce6d..bcb3744 100644
> --- a/package/squid/squid.mk
> +++ b/package/squid/squid.mk
> @@ -50,11 +50,6 @@ else
>  SQUID_CONF_ENV += squid_cv_gnu_atomics=no
>  endif
>  
> -# On uClibc librt needs libpthread
> -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
> -SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
> -endif

 In [1], Baruch wrote:

B> package/squid/squid.mk
B>
B>   Needed for shm_open().

 But indeed, the -lrt is added by the configure script, this workaround was only
needed for uClibc which used pthread functions from librt so needed to be linked
with libpthread as well.

 Adding Baruch in Cc to double-check. Baruch, can you confirm that this can
indeed be removed?

 For me:
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout


> -
>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>  SQUID_CONF_OPTS += --with-openssl
>  SQUID_DEPENDENCIES += openssl
> 

-- 
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

[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Arnout Vandecappelle]

On 27-06-17 22:24, Arnout Vandecappelle wrote:
> 
> 
> On 27-06-17 21:06, Waldemar Brodkorb wrote:
>> As all librt and libpthread functions are integrated into
>> libc for a while, workaround no longer required.
>>
>> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
>> ---
>>  package/squid/squid.mk | 5 -----
>>  1 file changed, 5 deletions(-)
>>
>> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
>> index 976ce6d..bcb3744 100644
>> --- a/package/squid/squid.mk
>> +++ b/package/squid/squid.mk
>> @@ -50,11 +50,6 @@ else
>>  SQUID_CONF_ENV += squid_cv_gnu_atomics=no
>>  endif
>>  
>> -# On uClibc librt needs libpthread
>> -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
>> -SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
>> -endif
> 
>  In [1], Baruch wrote:

 Forgot:

[1] http://lists.busybox.net/pipermail/buildroot/2017-June/195212.html


 Regards,
 Arnout

> 
> B> package/squid/squid.mk
> B>
> B>   Needed for shm_open().
> 
>  But indeed, the -lrt is added by the configure script, this workaround was only
> needed for uClibc which used pthread functions from librt so needed to be linked
> with libpthread as well.
> 
>  Adding Baruch in Cc to double-check. Baruch, can you confirm that this can
> indeed be removed?
> 
>  For me:
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> 
> 
>  Regards,
>  Arnout
> 
> 
>> -
>>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>>  SQUID_CONF_OPTS += --with-openssl
>>  SQUID_DEPENDENCIES += openssl
>>
> 

-- 
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

[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Baruch Siach]

Hi Arnout,

On Tue, Jun 27, 2017 at 10:24:40PM +0200, Arnout Vandecappelle wrote:
> On 27-06-17 21:06, Waldemar Brodkorb wrote:
> > As all librt and libpthread functions are integrated into
> > libc for a while, workaround no longer required.
> > 
> > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> > ---
> >  package/squid/squid.mk | 5 -----
> >  1 file changed, 5 deletions(-)
> > 
> > diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> > index 976ce6d..bcb3744 100644
> > --- a/package/squid/squid.mk
> > +++ b/package/squid/squid.mk
> > @@ -50,11 +50,6 @@ else
> >  SQUID_CONF_ENV += squid_cv_gnu_atomics=no
> >  endif
> >  
> > -# On uClibc librt needs libpthread
> > -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
> > -SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
> > -endif
> 
>  In [1], Baruch wrote:
> 
> B> package/squid/squid.mk
> B>
> B>   Needed for shm_open().
> 
>  But indeed, the -lrt is added by the configure script, this workaround was only
> needed for uClibc which used pthread functions from librt so needed to be linked
> with libpthread as well.
> 
>  Adding Baruch in Cc to double-check. Baruch, can you confirm that this can
> indeed be removed?

Yes. I missed the uClibc condition when I wrote that. I have now checked with 
a current uClibc-ng toolchain, and indeed all former librt symbols are in the 
main libc. librt.a is empty.

Thanks Waldemar and Arnout for double checking.

>  For me:
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Acked-by: Baruch Siach <baruch@tkos.co.il>

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH] squid: uClibc workaround no longer required

[Thomas Petazzoni]

Hello,

On Tue, 27 Jun 2017 21:06:30 +0200, Waldemar Brodkorb wrote:
> As all librt and libpthread functions are integrated into
> libc for a while, workaround no longer required.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/squid/squid.mk | 5 -----
>  1 file changed, 5 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com