2 2

[alpine-aports] [PATCH] community/libcoro: fix build on armv7

Milan P. Stanić
Details
Message ID
<20190103180636.4774-1-mps@arvanta.net>
Sender timestamp
1546538796
DKIM signature
missing
Download raw message
Patch: +2 -6
use CORO_SJLJ build C flag on all architectures
---
 community/libcoro/APKBUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/community/libcoro/APKBUILD b/community/libcoro/APKBUILD
index cdd5562aa7..0e0bd4307b 100644
--- a/community/libcoro/APKBUILD
+++ b/community/libcoro/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=libcoro
 pkgver=6.513
-pkgrel=0
+pkgrel=1
 pkgdesc="Coroutines (cooperative multitasking) in a portable fashion implemented in C"
 url="http://software.schmorp.de/pkg/libcoro.html"
 arch="all"
@@ -42,11 +42,7 @@ prepare() {
 build() {
 	cd "$builddir"
 
-	CFLAGS="-fPIC -pedantic -Wall"
-	case "$CARCH" in
-		x86* | armv7*) CFLAGS="$CFLAGS -DCORO_ASM";;
-		*) CFLAGS="$CFLAGS -DCORO_SJLJ";;
-	esac
+	CFLAGS="-DCORO_SJLJ -fPIC -pedantic -Wall"
 
 	# Build shared lib.
 	$CC $CFLAGS -O3 -c coro.c
-- 
2.18.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras
Details
Message ID
<20190104082440.0ace5e56@vostro>
In-Reply-To
<20190103180636.4774-1-mps@arvanta.net> (view parent)
Sender timestamp
1546583080
DKIM signature
missing
Download raw message
Hi,

We also have now main/libucontext for the makecontext() support. Would
it make sense to use CORO_UCONTEXT + libucontext; or is the CORO_SJLJ
more favorable?

Timo

On Thu,  3 Jan 2019 19:06:36 +0100
Milan P. Stanić <mps@arvanta.net> wrote:

> use CORO_SJLJ build C flag on all architectures
> ---
>  community/libcoro/APKBUILD | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/community/libcoro/APKBUILD b/community/libcoro/APKBUILD
> index cdd5562aa7..0e0bd4307b 100644
> --- a/community/libcoro/APKBUILD
> +++ b/community/libcoro/APKBUILD
> @@ -2,7 +2,7 @@
>  # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
>  pkgname=libcoro
>  pkgver=6.513
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="Coroutines (cooperative multitasking) in a portable fashion
> implemented in C" url="http://software.schmorp.de/pkg/libcoro.html"
>  arch="all"
> @@ -42,11 +42,7 @@ prepare() {
>  build() {
>  	cd "$builddir"
>  
> -	CFLAGS="-fPIC -pedantic -Wall"
> -	case "$CARCH" in
> -		x86* | armv7*) CFLAGS="$CFLAGS -DCORO_ASM";;
> -		*) CFLAGS="$CFLAGS -DCORO_SJLJ";;
> -	esac
> +	CFLAGS="-DCORO_SJLJ -fPIC -pedantic -Wall"
>  
>  	# Build shared lib.
>  	$CC $CFLAGS -O3 -c coro.c



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Milan P. Stanic
Details
Message ID
<20190104104347.GA6351@arya.arvanta.net>
In-Reply-To
<20190104082440.0ace5e56@vostro> (view parent)
Sender timestamp
1546598627
DKIM signature
missing
Download raw message
On Fri, 2019-01-04 at 08:24, Timo Teras wrote:
> Hi,
> 
> We also have now main/libucontext for the makecontext() support. Would
> it make sense to use CORO_UCONTEXT + libucontext; or is the CORO_SJLJ
> more favorable?

With -DCORO_UCONTEXT it doesn't build test.c
This test.c is taken from some github repo and is not in the upstream
CVS and to me seems as not needed in Alpine.

Without this file libcoro APKBUILD work just fine without needs for any
patch. I changed CFLAGS only to pass 'abuild check'.
If the test must be done there is conftest.c which could be tried
instead of the test.c

BTW, only one package, testing/tarantool, depends on libcoro.
Maybe libcoro could be moved to testing?
And, there is a newer version of libcoro on upstream site, but not sure
if it needs update in Alpine repo.

> Timo
> 
> On Thu,  3 Jan 2019 19:06:36 +0100
> Milan P. Stanić <mps@arvanta.net> wrote:
> 
> > use CORO_SJLJ build C flag on all architectures
> > ---
> >  community/libcoro/APKBUILD | 8 ++------
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> > 
> > diff --git a/community/libcoro/APKBUILD b/community/libcoro/APKBUILD
> > index cdd5562aa7..0e0bd4307b 100644
> > --- a/community/libcoro/APKBUILD
> > +++ b/community/libcoro/APKBUILD
> > @@ -2,7 +2,7 @@
> >  # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
> >  pkgname=libcoro
> >  pkgver=6.513
> > -pkgrel=0
> > +pkgrel=1
> >  pkgdesc="Coroutines (cooperative multitasking) in a portable fashion
> > implemented in C" url="http://software.schmorp.de/pkg/libcoro.html"
> >  arch="all"
> > @@ -42,11 +42,7 @@ prepare() {
> >  build() {
> >  	cd "$builddir"
> >  
> > -	CFLAGS="-fPIC -pedantic -Wall"
> > -	case "$CARCH" in
> > -		x86* | armv7*) CFLAGS="$CFLAGS -DCORO_ASM";;
> > -		*) CFLAGS="$CFLAGS -DCORO_SJLJ";;
> > -	esac
> > +	CFLAGS="-DCORO_SJLJ -fPIC -pedantic -Wall"
> >  
> >  	# Build shared lib.
> >  	$CC $CFLAGS -O3 -c coro.c
> 
> 
> 
> ---
> Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
> Help:         alpine-aports+help@lists.alpinelinux.org
> ---
> 


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---