[meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-daemons/squid/squid_4.9.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-networking/recipes-daemons/squid/squid_4.9.bb
index 6f202cf401..19949acd84 100644
--- a/meta-networking/recipes-daemons/squid/squid_4.9.bb
+++ b/meta-networking/recipes-daemons/squid/squid_4.9.bb
@@ -40,6 +40,8 @@ inherit autotools pkgconfig useradd ptest perlnative
 
 LDFLAGS_append_mipsarch = " -latomic"
 LDFLAGS_append_powerpc = " -latomic"
+LDFLAGS_append_riscv64 = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
-- 
2.25.0

[meta-networking][PATCH 2/3] grpc: Link with libatomic on riscv

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
index 6ab15dae40..752562eb33 100644
--- a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
+++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
@@ -48,6 +48,14 @@ do_configure_prepend_powerpc() {
     sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
 }
 
+do_configure_prepend_riscv64() {
+    sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
+}
+
+do_configure_prepend_riscv32() {
+    sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
+}
+
 do_configure_prepend_toolchain-clang_x86() {
     sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
 }
-- 
2.25.0

[meta-webserver][PATCH 3/3] netdata: Add libatomic to link step

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-webserver/recipes-webadmin/netdata/netdata_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
index d179e84e33..d6a5ce0662 100644
--- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
+++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
@@ -26,6 +26,8 @@ DEPENDS += "zlib util-linux"
 inherit pkgconfig autotools-brokensep useradd systemd
 
 LIBS_toolchain-clang_x86 = "-latomic"
+LIBS_riscv64 = "-latomic"
+LIBS_riscv32 = "-latomic"
 export LIBS
 
 #systemd
-- 
2.25.0

Re: [meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[akuster808]

On 1/28/20 1:53 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

Is this for the same reason as for nodejs Cento7 fix ?

- armin
> ---
>  meta-networking/recipes-daemons/squid/squid_4.9.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-networking/recipes-daemons/squid/squid_4.9.bb
> index 6f202cf401..19949acd84 100644
> --- a/meta-networking/recipes-daemons/squid/squid_4.9.bb
> +++ b/meta-networking/recipes-daemons/squid/squid_4.9.bb
> @@ -40,6 +40,8 @@ inherit autotools pkgconfig useradd ptest perlnative
>  
>  LDFLAGS_append_mipsarch = " -latomic"
>  LDFLAGS_append_powerpc = " -latomic"
> +LDFLAGS_append_riscv64 = " -latomic"
> +LDFLAGS_append_riscv32 = " -latomic"
>  
>  USERADD_PACKAGES = "${PN}"
>  USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"

Re: [meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[Khem Raj]

On Wed, Jan 29, 2020 at 9:32 PM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 1/28/20 1:53 PM, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> Is this for the same reason as for nodejs Cento7 fix ?
>

pretty much same problem, although a better fix is to detect it
during build but every build system has its own nuance.

> - armin
> > ---
> >  meta-networking/recipes-daemons/squid/squid_4.9.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-networking/recipes-daemons/squid/squid_4.9.bb
> > index 6f202cf401..19949acd84 100644
> > --- a/meta-networking/recipes-daemons/squid/squid_4.9.bb
> > +++ b/meta-networking/recipes-daemons/squid/squid_4.9.bb
> > @@ -40,6 +40,8 @@ inherit autotools pkgconfig useradd ptest perlnative
> >
> >  LDFLAGS_append_mipsarch = " -latomic"
> >  LDFLAGS_append_powerpc = " -latomic"
> > +LDFLAGS_append_riscv64 = " -latomic"
> > +LDFLAGS_append_riscv32 = " -latomic"
> >
> >  USERADD_PACKAGES = "${PN}"
> >  USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
>

Re: [meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[akuster808]

On 1/29/20 10:14 PM, Khem Raj wrote:
> On Wed, Jan 29, 2020 at 9:32 PM akuster808 <akuster808@gmail.com> wrote:
>>
>>
>> On 1/28/20 1:53 PM, Khem Raj wrote:
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Is this for the same reason as for nodejs Cento7 fix ?
>>
> pretty much same problem, although a better fix is to detect it
> during build but every build system has its own nuance.
ok. backport worthy then.

thanks,
Armin
>
>> - armin
>>> ---
>>>  meta-networking/recipes-daemons/squid/squid_4.9.bb | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-networking/recipes-daemons/squid/squid_4.9.bb
>>> index 6f202cf401..19949acd84 100644
>>> --- a/meta-networking/recipes-daemons/squid/squid_4.9.bb
>>> +++ b/meta-networking/recipes-daemons/squid/squid_4.9.bb
>>> @@ -40,6 +40,8 @@ inherit autotools pkgconfig useradd ptest perlnative
>>>
>>>  LDFLAGS_append_mipsarch = " -latomic"
>>>  LDFLAGS_append_powerpc = " -latomic"
>>> +LDFLAGS_append_riscv64 = " -latomic"
>>> +LDFLAGS_append_riscv32 = " -latomic"
>>>
>>>  USERADD_PACKAGES = "${PN}"
>>>  USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"

Re: [meta-networking][PATCH 1/3] squid: Link with libatomic on riscv

[Khem Raj]

On Thu, Jan 30, 2020 at 11:01 AM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 1/29/20 10:14 PM, Khem Raj wrote:
> > On Wed, Jan 29, 2020 at 9:32 PM akuster808 <akuster808@gmail.com> wrote:
> >>
> >>
> >> On 1/28/20 1:53 PM, Khem Raj wrote:
> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> Is this for the same reason as for nodejs Cento7 fix ?
> >>
> > pretty much same problem, although a better fix is to detect it
> > during build but every build system has its own nuance.
> ok. backport worthy then.
yes

thanks