* [gentoo-commits] repo/gentoo:master commit in: app-arch/arc/, app-arch/arc/files/
@ 2020-05-15 7:59 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-05-15 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 683780129630d693bb614c41f885946dcb885831
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 07:58:19 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 15 07:59:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68378012
app-arch/arc: Fix building with CFLAGS=-fno-common
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706714
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
app-arch/arc/arc-5.21p.ebuild | 1 +
app-arch/arc/files/arc-5.21p-fno-common.patch | 34 +++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 93335639d0e..f62a74e5478 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -18,6 +18,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.21m-darwin.patch
"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
"${FILESDIR}"/${PN}-5.21o-interix.patch
+ "${FILESDIR}"/${PN}-5.21p-fno-common.patch
)
src_prepare() {
diff --git a/app-arch/arc/files/arc-5.21p-fno-common.patch b/app-arch/arc/files/arc-5.21p-fno-common.patch
new file mode 100644
index 00000000000..5de65e341c7
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21p-fno-common.patch
@@ -0,0 +1,34 @@
+--- a/arc.h
++++ b/arc.h
+@@ -129,4 +129,8 @@
+ extern u_short olddate; /* old archive date stamp */
+ extern u_short oldtime; /* old archive time stamp */
+ extern int dosquash; /* squash instead of crunch */
++extern long stdlen; /* bytes to read */
++extern u_char *outbuf;
++extern u_char *outend;
++extern short crcval; /* CRC check value */
+ #endif /* DONT_DEFINE */
+--- a/arclzw.c
++++ b/arclzw.c
+@@ -58,8 +58,7 @@
+
+ extern u_char *pinbuf;
+ u_char *inbeg, *inend;
+-u_char *outbuf;
+-u_char *outbeg, *outend;
++u_char *outbeg;
+
+ static int sp; /* current stack pointer */
+ static int inflag;
+--- a/arcunp.c
++++ b/arcunp.c
+@@ -39,8 +39,6 @@
+ #define NOHIST 0 /* no relevant history */
+ #define INREP 1 /* sending a repeated value */
+
+-short crcval; /* CRC check value */
+-long stdlen; /* bytes to read */
+ #if !DOS
+ static int gotcr; /* got a carriage return? */
+ #endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/arc/, app-arch/arc/files/
@ 2021-03-23 4:34 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-23 4:34 UTC (permalink / raw
To: gentoo-commits
commit: 8c42db855843afcebe17841d59b12ccac373b394
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 23 04:24:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 23 04:24:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c42db85
app-arch/arc: port to EAPI 7
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-arch/arc/arc-5.21p.ebuild | 5 ++---
app-arch/arc/files/arc-5.21m-darwin.patch | 4 ++--
app-arch/arc/files/arc-5.21o-interix.patch | 5 ++---
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index fafc0962ba1..37ec75be30c 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
PATCHES=(
"${FILESDIR}"/${PN}-5.21m-darwin.patch
diff --git a/app-arch/arc/files/arc-5.21m-darwin.patch b/app-arch/arc/files/arc-5.21m-darwin.patch
index fb1eb5ea259..85a36593dbf 100644
--- a/app-arch/arc/files/arc-5.21m-darwin.patch
+++ b/app-arch/arc/files/arc-5.21m-darwin.patch
@@ -1,5 +1,5 @@
---- arc-5.21m/tmclock.c
-+++ arc-5.21m/tmclock.c
+--- a/tmclock.c
++++ b/tmclock.c
@@ -14,7 +14,7 @@
/* Julian day number of the Unix* clock's origin, 01 Jan 1970. */
#define JD1970 2440587L
diff --git a/app-arch/arc/files/arc-5.21o-interix.patch b/app-arch/arc/files/arc-5.21o-interix.patch
index f95aee85e37..8c90eed819f 100644
--- a/app-arch/arc/files/arc-5.21o-interix.patch
+++ b/app-arch/arc/files/arc-5.21o-interix.patch
@@ -1,6 +1,5 @@
-diff -ru arc-5.21o.orig/arcdos.c arc-5.21o/arcdos.c
---- arc-5.21o.orig/arcdos.c 2008-03-30 15:44:53 +0200
-+++ arc-5.21o/arcdos.c 2008-03-30 15:45:51 +0200
+--- a/arcdos.c
++++ b/arcdos.c
@@ -30,7 +30,7 @@
#if UNIX
#include <sys/types.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-23 4:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-15 7:59 [gentoo-commits] repo/gentoo:master commit in: app-arch/arc/, app-arch/arc/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2021-03-23 4:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox