haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

zziplib: fix recipe (#1700)

Browse Source
This commit is contained in:
Schrijvers Luc
2017-10-08 09:43:57 +02:00
committed by diversys
parent 923f6b9f4f
commit 731fbc828d
2 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dev-libs/zziplib/patches/zziplib-0.13.67.patchset Normal file
View File

@@ -0,0 +1,32 @@
From a41afabc0388d0756d24476498decd7b30c74c41 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 7 Oct 2017 21:03:37 +0200
Subject: gcc2 fix
diff --git a/zzip/mmapped.c b/zzip/mmapped.c
index 69070df..410487a 100644
--- a/zzip/mmapped.c
+++ b/zzip/mmapped.c
@@ -440,11 +440,13 @@ zzip_disk_findfirst(ZZIP_DISK * disk)
errno = EFBIG;
return 0;
}
- zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer);
- DBG2("disk64 rootseek at %lli", (long long)rootseek);
- root = disk->buffer + rootseek;
- if (root > p)
- continue;
+ {
+ zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer);
+ DBG2("disk64 rootseek at %lli", (long long)rootseek);
+ root = disk->buffer + rootseek;
+ if (root > p)
+ continue;
+ }
} else
{
continue;
--
2.7.0

52
dev-libs/zziplib/zziplib-0.13.67.recipe
View File

@@ -5,31 +5,29 @@ HOMEPAGE="http://zziplib.sourceforge.net/"
COPYRIGHT="1999-2010 Guido Draheim"
LICENSE="GNU LGPL v2.1
MPL v1.1"
REVISION="2"
SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz"
REVISION="1"
CHECKSUM_SHA256="1278178bdabac832da6bbf161033d890d335a2e38493c5af553ff5ce7b9b0220"
ARCHITECTURES="x86_gcc2 x86 x86_64"
if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
PATCHES="zziplib-$portVersion.patchset"
fi
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
zziplib$secondaryArchSuffix = $portVersion
cmd:zziplib$secondaryArchSuffix = $portVersion
cmd:unzip_mem
cmd:unzzip
cmd:unzzip_big
cmd:unzzip_mem
cmd:unzzip_mix
cmd:unzzipcat
cmd:unzzipcat_mem
cmd:unzzipcat_seeko
cmd:unzzipdir
cmd:unzzipdir_mem
cmd:zzcat
cmd:zzdir
cmd:zzxorcat
cmd:zzxorcopy
cmd:zzxordir
cmd:unzip_mem$secondaryArchSuffix = $portVersion
cmd:unzzip$secondaryArchSuffix = $portVersion
cmd:unzzip_big$secondaryArchSuffix = $portVersion
cmd:unzzip_mem$secondaryArchSuffix = $portVersion
cmd:unzzip_mix$secondaryArchSuffix = $portVersion
cmd:zzcat$secondaryArchSuffix = $portVersion
cmd:zzdir$secondaryArchSuffix = $portVersion
cmd:zzxorcat$secondaryArchSuffix = $portVersion
cmd:zzxorcopy$secondaryArchSuffix = $portVersion
cmd:zzxordir$secondaryArchSuffix = $portVersion
lib:libzzip_0$secondaryArchSuffix = 13.0.65 compat >= 13
lib:libzzipfseeko_0$secondaryArchSuffix = 13.0.65 compat >= 13
lib:libzzipmmapped_0$secondaryArchSuffix = 13.0.65 compat >= 13
@@ -53,15 +51,19 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
docbook_xml_dtd
docbook_xsl_stylesheets
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:autoreconf$secondaryArchSuffix
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:libtoolize$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:makeinfo
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python2
cmd:tar
cmd:xmlto
@@ -73,9 +75,9 @@ PATCH()
}
BUILD()
{
libtoolize --force --copy --install
autoreconf -i
runConfigure ./configure
libtoolize -fci
autoreconf -vfi
runConfigure ./configure --mandir=$manDir
make $jobArgs
}
@@ -83,11 +85,15 @@ INSTALL()
{
make install
rm $libDir/libzzip*.la
prepareInstalledDevelLibs \
libzzip \
libzzipfseeko \
libzzipmmapped \
libzzipwrap
fixPkgconfig
packageEntries devel \
$developDir
}