arc, enable 32bit (#11288)

This commit is contained in:
Schrijvers Luc
2024-10-30 15:34:59 +01:00
committed by GitHub
parent 80b4895144
commit e52b4a10e5
2 changed files with 52 additions and 10 deletions

View File

@@ -4,28 +4,29 @@ DESCRIPTION="This archiver let's you create and extract files in the old DOS \
HOMEPAGE="https://github.com/ani6al/arc/"
COPYRIGHT="1985-2009 Thom Henderson"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="bde44648d0c451852612da2256f5a7e48b97d0d625ba88b903d7f223959528cc"
PATCHES="arc-$portVersion.patchset"
ARCHITECTURES="all ?x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
arc = $portVersion
arc$secondaryArchSuffix = $portVersion
cmd:arc = $portVersion
cmd:marc = $portVersion
"
REQUIRES="
haiku
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
cmd:gcc
cmd:make
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:make
"
BUILD()
@@ -35,8 +36,8 @@ BUILD()
INSTALL()
{
mkdir -p $binDir
cp -af arc marc $binDir
mkdir -p $prefix/bin
cp -af arc marc $prefix/bin
mkdir -p $manDir/man1
cp -af arc.1 marc.1 $manDir/man1
}

View File

@@ -1,4 +1,4 @@
From 59992a4f66278eeb1832e5dbce33619b864c4f58 Mon Sep 17 00:00:00 2001
From 4da32eca3c1e505c716d55fd26311d3ac9402589 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 24 Nov 2013 18:37:38 -0700
Subject: Minor Haiku fixes
@@ -39,5 +39,46 @@ index af98bd4..c297d7e 100644
#else
#include <time.h> /* Sys V. Bleah. */
--
2.14.2
2.45.2
From 9328fcb166e3619a302131aed67456c42c6150f6 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 30 Oct 2024 14:51:54 +0100
Subject: fix multiple definitions of *
diff --git a/arclzw.c b/arclzw.c
index dc56412..4f21ea4 100644
--- a/arclzw.c
+++ b/arclzw.c
@@ -56,8 +56,9 @@ static VOID putcode();
extern u_char *pinbuf;
u_char *inbeg, *inend;
-u_char *outbuf;
-u_char *outbeg, *outend;
+extern u_char *outbuf;
+u_char *outbeg;
+extern u_char *outend;
static int sp; /* current stack pointer */
static int inflag;
diff --git a/arcunp.c b/arcunp.c
index 9a6dd48..6fb7b4c 100644
--- a/arcunp.c
+++ b/arcunp.c
@@ -37,8 +37,8 @@ extern int lastc;
#define NOHIST 0 /* no relevant history */
#define INREP 1 /* sending a repeated value */
-short crcval; /* CRC check value */
-long stdlen; /* bytes to read */
+extern short crcval; /* CRC check value */
+extern long stdlen; /* bytes to read */
#if !DOS
static int gotcr; /* got a carriage return? */
#endif
--
2.45.2