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

tar: bump to 1.29, rework patch, mark x86 as tested, add TEST(). (#598)

Browse Source
This commit is contained in:
fbrosson
2016-05-25 23:41:30 +00:00
committed by waddlesplash
parent 4b0e75746d
commit 5b8104adf2
2 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app-arch/tar/patches/tar-1.28.patchset → app-arch/tar/patches/tar-1.29.patchset
View File

@@ -4,27 +4,11 @@ Date: Wed, 10 Sep 2014 16:24:50 +0000
Subject: gcc2 patch
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
index d64cf2f..c93f53d 100644
--- a/lib/wordsplit.h
+++ b/lib/wordsplit.h
@@ -34,9 +34,9 @@ struct wordsplit
const char *ws_escape;
void (*ws_alloc_die) (struct wordsplit * wsp);
void (*ws_error) (const char *, ...)
- __attribute__ ((__format__ (__printf__, 1, 2)));
+;
void (*ws_debug) (const char *, ...)
- __attribute__ ((__format__ (__printf__, 1, 2)));
+;
const char **ws_env;
const char *(*ws_getvar) (const char *, size_t, void *);
diff --git a/src/tar.c b/src/tar.c
index cd32379..d975e37 100644
index ba24c43..09c344d 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -566,11 +566,10 @@ static struct argp_option options[] = {
@@ -548,11 +548,10 @@ static struct argp_option options[] = {
N_("cancel the effect of --delay-directory-restore option"), GRID+1 },
{"sort", SORT_OPTION, N_("ORDER"), 0,
#if D_INO_IN_DIRENT
@@ -41,3 +25,26 @@ index cd32379..d975e37 100644
--
2.2.2
From 3269fb640f76f56b450231ae78576c855da9dda1 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Mon, 16 May 2016 18:46:10 +0000
Subject: Use __attribute__ only if gcc > 2.95 (instead of gcc >= 2.7)
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
index e0d2559..627a626 100644
--- a/lib/wordsplit.h
+++ b/lib/wordsplit.h
@@ -22,7 +22,7 @@
#include <stddef.h>
-#if 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
#else
# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) /* empty */
--
2.7.0

32
app-arch/tar/tar-1.28.recipe → app-arch/tar/tar-1.29.recipe
View File

@@ -9,15 +9,15 @@ tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite
the utility's name, Tar can direct its output to available devices, files, or \
other programs (using pipes), it can even access remote devices or files (as \
archives)."
HOMEPAGE="http://www.gnu.org/software/tar/"
COPYRIGHT="1990-2011 Free Software Foundation, Inc."
HOMEPAGE="https://www.gnu.org/software/tar/"
COPYRIGHT="1990-2016 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="http://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
CHECKSUM_SHA256="60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562"
SOURCE_URI="http://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2"
CHECKSUM_SHA256="236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2"
PATCHES="tar-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
PROVIDES="
tar = $portVersion compat >= 1
@@ -26,18 +26,35 @@ PROVIDES="
REQUIRES="
haiku
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:automake
cmd:autoreconf
cmd:find
cmd:gcc
cmd:ld
cmd:make
cmd:sed
"
if [ "$recipeAction" = TEST ]; then
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
cmd:compress
cmd:gzip
cmd:bzip2
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
cmd:lzip
cmd:lzma
cmd:xz
"
fi
fi
defineDebugInfoPackage tar $binDir/tar
BUILD()
@@ -56,3 +73,8 @@ INSTALL()
rm $libDir/charset.alias
}
TEST()
{
make check
}