p7zip: fix some warnings

This commit is contained in:
Jerome Duval
2021-04-15 19:24:46 +02:00
parent 22d5d25b73
commit 7ebf467046
2 changed files with 9 additions and 9 deletions

View File

@@ -5,7 +5,7 @@ OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
HOMEPAGE="http://p7zip.sourceforge.net"
COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
LICENSE="GNU LGPL v2.1"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/jinfeihan57/p7zip/archive/v$portVersion/p7zip-$portVersion.tar.gz"
CHECKSUM_SHA256="ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef"
PATCHES="p7zip-$portVersion.patchset"
@@ -35,6 +35,7 @@ BUILD_REQUIRES="
devel:libiconv$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make

View File

@@ -1,4 +1,4 @@
From 1dbcc13229450c14c4ea1676d36bbba68cee6e42 Mon Sep 17 00:00:00 2001
From b0f81cbba1b9014d4770841c124683de9aa20268 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:08:25 +0100
Subject: applying patch p7zip-9.20.1.patch
@@ -30,7 +30,7 @@ index 322fce2..69a9f43 100644
2.30.0
From 4c29d321f68e6a17428951e821dfdae1cfb85217 Mon Sep 17 00:00:00 2001
From 3371112ba4216088da75d9219c418496f4dfa9d8 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 10:15:58 +0100
Subject: Fix detection of RAM size.
@@ -53,7 +53,7 @@ index 69a9f43..5b4e0d9 100644
2.30.0
From 636417a9778449d04dfd704b81fac929cd66fb4f Mon Sep 17 00:00:00 2001
From cf62c205d25d73372f92625068e873bbf4362c9a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 4 Jan 2021 12:29:26 +0100
Subject: haiku: uses libiconv
@@ -76,7 +76,7 @@ index a6e71c2..99d781a 100644
2.30.0
From 43685fa63aea70a177160d1784a5adfb44134b5e Mon Sep 17 00:00:00 2001
From 78d3cc427e57013ae6cc047c885c430a09304142 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 Apr 2021 18:54:32 +0200
Subject: Haiku: fix 7z and 7zr build on x86_64
@@ -135,10 +135,10 @@ index 744af1f..796c7b4 100644
#else
int options_dlopen = 0;
diff --git a/makefile.haiku b/makefile.haiku
index 99d781a..d7169cd 100644
index 99d781a..9321912 100644
--- a/makefile.haiku
+++ b/makefile.haiku
@@ -1,15 +1,17 @@
@@ -1,7 +1,7 @@
OPTFLAGS=-O -s
@@ -147,8 +147,7 @@ index 99d781a..d7169cd 100644
-DENV_BEOS -DENV_HAIKU \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-DNDEBUG -D_REENTRANT -DENV_UNIX \
+ -D_UINT64_T_DECLARED \
$(LOCAL_FLAGS)
@@ -9,7 +9,8 @@ ALLFLAGS=${OPTFLAGS} \
CXX=g++
CC=gcc