[gentoo-proxy-maint] [PATCH 1/2] app-editors/vis: Add -fcommon

[gentoo-proxy-maint] [PATCH 1/2] app-editors/vis: Add -fcommon

[Haelwenn (lanodan) Monnier]

Closes: https://bugs.gentoo.org/716312
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 app-editors/vis/vis-0.5.ebuild  | 2 ++
 app-editors/vis/vis-9999.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index 08274f3b376..ffaeafaa266 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -42,6 +42,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
+
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 72ff783c840..6832624fb6b 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -34,6 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
+
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-- 
2.26.2

[gentoo-proxy-maint] [PATCH 2/2] app-editors/vis: Respect CC and CFLAGS in tests

[Haelwenn (lanodan) Monnier]

Closes: https://bugs.gentoo.org/722014
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 app-editors/vis/vis-0.5.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index ffaeafaa266..e7cf08742d4 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -32,6 +32,9 @@ src_prepare() {
 		if ! type -P vim &>/dev/null; then
 			sed -i 's/.*vim.*//' test/Makefile || die
 		fi
+
+		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
+		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
 	fi
 
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
-- 
2.26.2

Re: [gentoo-proxy-maint] [PATCH 1/2] app-editors/vis: Add -fcommon

[Joonas Niilola]

[-- Attachment #1.1: Type: text/plain, Size: 1311 bytes --]


On 5/11/20 12:38 AM, Haelwenn (lanodan) Monnier wrote:
> Closes: https://bugs.gentoo.org/716312
> Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
> ---
>  app-editors/vis/vis-0.5.ebuild  | 2 ++
>  app-editors/vis/vis-9999.ebuild | 2 ++
>  2 files changed, 4 insertions(+)
>
> diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
> index 08274f3b376..ffaeafaa266 100644
> --- a/app-editors/vis/vis-0.5.ebuild
> +++ b/app-editors/vis/vis-0.5.ebuild
> @@ -42,6 +42,8 @@ src_prepare() {
>  }
>  
>  src_configure() {
> +	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21

Let's use the recommended style,

https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common#The_-fcommon_workaround_.28discouraged.29


> +
>  	./configure \
>  		--prefix="${EPREFIX}"/usr \
>  		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
> diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
> index 72ff783c840..6832624fb6b 100644
> --- a/app-editors/vis/vis-9999.ebuild
> +++ b/app-editors/vis/vis-9999.ebuild
> @@ -34,6 +34,8 @@ src_prepare() {
>  }
>  
>  src_configure() {
> +	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
> +

Here too.

-- juippis



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 642 bytes --]

Re: [gentoo-proxy-maint] [PATCH 1/2] app-editors/vis: Add -fcommon

[Joonas Niilola]

[-- Attachment #1.1: Type: text/plain, Size: 810 bytes --]


On 5/15/20 4:24 PM, Joonas Niilola wrote:
> On 5/11/20 12:38 AM, Haelwenn (lanodan) Monnier wrote:
>>  }
>>  
>>  src_configure() {
>> +	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
> Let's use the recommended style,
>
> https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common#The_-fcommon_workaround_.28discouraged.29
>
>
You could've just told me it doesn't carry on to test phase. Although
still not happy with it (use {} around variables), merged as

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b015f553ce6b600fd938f381faee5429270d402c

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0615eb3242d0bea42719bea4f34fbcb75a14af5

-9999 seems to have been already fixed by upstream so not touching that
this time.

-- juippis



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 642 bytes --]