diff --git a/app-arch/cpio/cpio-2.13.recipe b/app-arch/cpio/cpio-2.14.recipe similarity index 72% rename from app-arch/cpio/cpio-2.13.recipe rename to app-arch/cpio/cpio-2.14.recipe index 9801841ed..b2638d3ac 100644 --- a/app-arch/cpio/cpio-2.13.recipe +++ b/app-arch/cpio/cpio-2.14.recipe @@ -10,18 +10,26 @@ with older cpio programs. When extracting from archives, cpio automatically \ recognizes which kind of archive it is reading and can read archives created \ on machines with a different byte-order." HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" -COPYRIGHT="1988-2010 Free Software Foundation, Inc." +COPYRIGHT="1988-2023 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://ftp.gnu.org/gnu/cpio/cpio-$portVersion.tar.gz" -CHECKSUM_SHA256="e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88" +CHECKSUM_SHA256="145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454" PATCHES="cpio-$portVersion.patchset" -ARCHITECTURES="all" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi PROVIDES=" cpio = $portVersion - cmd:cpio + cmd:cpio$commandSuffix " REQUIRES=" haiku @@ -49,7 +57,8 @@ BUILD() aclocal autoreconf autoconf - CFLAGS=-D_BSD_SOURCE runConfigure ./configure + CFLAGS=-D_BSD_SOURCE runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir make $jobArgs } diff --git a/app-arch/cpio/patches/cpio-2.13.patchset b/app-arch/cpio/patches/cpio-2.13.patchset deleted file mode 100644 index 463f5c1cb..000000000 --- a/app-arch/cpio/patches/cpio-2.13.patchset +++ /dev/null @@ -1,88 +0,0 @@ -From feddb899d44dbdee35f149eb9d3655c399a4340e Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 14 Oct 2014 14:38:24 +0200 -Subject: Search for gethostbyname in libnetwork. - - -diff --git a/configure.ac b/configure.ac -index 2132256..95983b1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,8 @@ AC_CHECK_TYPE(gid_t, int) - AC_HEADER_STDC - AC_HEADER_DIRENT - -+AC_SEARCH_LIBS(gethostbyname, [socket, network]) -+ - AC_CHECK_FUNCS([fchmod fchown]) - # This is needed for mingw build - AC_CHECK_FUNCS([setmode getpwuid getpwnam getgrgid getgrnam pipe fork getuid geteuid]) --- -2.23.0 - - -From 5ff823bec064715a32a60dc0ea46e17990f9def0 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 14 Oct 2014 14:38:58 +0200 -Subject: gcc2 fixes. - - -diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y -index a474312..7d57358 100644 ---- a/gnu/parse-datetime.y -+++ b/gnu/parse-datetime.y -@@ -2095,7 +2095,7 @@ parse_datetime2 (struct timespec *result, char const *p, - dbg_printf (_("warning: when adding relative days, " \ - "it is recommended to specify 12:00pm\n")); - } -- -+ { - int year = tm.tm_year + pc.rel.year; - int month = tm.tm_mon + pc.rel.month; - int day = tm.tm_mday + pc.rel.day; -@@ -2112,6 +2112,7 @@ parse_datetime2 (struct timespec *result, char const *p, - tm.tm_year = year; - tm.tm_mon = month; - tm.tm_mday = day; -+ } - tm.tm_hour = tm0.tm_hour; - tm.tm_min = tm0.tm_min; - tm.tm_sec = tm0.tm_sec; -@@ -2272,14 +2273,17 @@ parse_datetime2 (struct timespec *result, char const *p, - - dbg_printf (_("final: %ld.%09ld (epoch-seconds)\n"), - result->tv_sec,result->tv_nsec); -- -+{ - struct tm const *gmt = gmtime (&result->tv_sec); - dbg_printf (_("final: %s (UTC0)\n"), - debug_strfdatetime (gmt, NULL, dbg_tm, sizeof (dbg_tm))); -+} -+{ - struct tm const *lmt = localtime (&result->tv_sec); - dbg_printf (_("final: %s (output timezone TZ=%+03d:%02d)\n"), - debug_strfdatetime (lmt, NULL, dbg_tm, sizeof (dbg_tm)), - (int)(otz/60), abs ((int)otz)%60); -+} - } - } - -diff --git a/src/makepath.c b/src/makepath.c -index f937166..b552a48 100644 ---- a/src/makepath.c -+++ b/src/makepath.c -@@ -66,10 +66,10 @@ make_path (char const *argpath, - - if (stat (dirpath, &stats)) - { -+ char *slash = dirpath; - tmpmode = MODE_RWX & ~ newdir_umask; - invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ tmpmode; - -- char *slash = dirpath; - while (*slash == '/') - slash++; - while ((slash = strchr (slash, '/'))) --- -2.23.0 - diff --git a/app-arch/cpio/patches/cpio-2.14.patchset b/app-arch/cpio/patches/cpio-2.14.patchset new file mode 100644 index 000000000..75c0a34e0 --- /dev/null +++ b/app-arch/cpio/patches/cpio-2.14.patchset @@ -0,0 +1,22 @@ +From 12c7caa80af6b5953695e12890d31370ee1f4247 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 14 Oct 2014 14:38:24 +0200 +Subject: Search for gethostbyname in libnetwork. + + +diff --git a/configure.ac b/configure.ac +index de479e7..12e0266 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,6 +46,8 @@ AC_HEADER_DIRENT + AX_COMPILE_CHECK_RETTYPE([major], [0]) + AX_COMPILE_CHECK_RETTYPE([minor], [0]) + ++AC_SEARCH_LIBS(gethostbyname, [socket, network]) ++ + AC_CHECK_FUNCS([fchmod fchown]) + # This is needed for mingw build + AC_CHECK_FUNCS([setmode getpwuid getpwnam getgrgid getgrnam pipe fork getuid geteuid]) +-- +2.37.3 +