OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Oct-2006 13:31:24 Branch: HEAD Handle: 2006102412312400 Modified files: openpkg-src/cpio cpio.patch cpio.spec Log: fix building under FreeBSD/amd64 where inline causes trouble Summary: Revision Changes Path 1.6 +24 -3 openpkg-src/cpio/cpio.patch 1.35 +1 -1 openpkg-src/cpio/cpio.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/cpio/cpio.patch ============================================================================ $ cvs diff -u -r1.5 -r1.6 cpio.patch --- openpkg-src/cpio/cpio.patch 22 Oct 2006 09:30:54 -0000 1.5 +++ openpkg-src/cpio/cpio.patch 24 Oct 2006 11:31:24 -0000 1.6 @@ -1,6 +1,27 @@ +Index: lib/argp-help.c +--- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200 ++++ lib/argp-help.c 2006-10-24 13:29:40 +0200 +@@ -567,7 +567,7 @@ + return val; + } + +-static inline int ++static int + __attribute__ ((always_inline)) + hol_entry_long_iterate (const struct hol_entry *entry, + int (*func)(const struct argp_option *opt, +@@ -592,7 +592,7 @@ + } + + /* Iterator that returns true for the first short option. */ +-static inline int ++static int + until_short (const struct argp_option *opt, const struct argp_option *real, + const char *domain, void *cookie) + { Index: lib/rtapelib.c --- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100 -+++ lib/rtapelib.c 2006-10-22 11:09:19 +0200 ++++ lib/rtapelib.c 2006-10-24 13:18:23 +0200 @@ -625,7 +625,7 @@ { char command_buffer[COMMAND_BUFFER_SIZE]; @@ -25,7 +46,7 @@ *--p = 0; Index: lib/system.h --- lib/system.h.orig 2006-09-08 18:57:52 +0200 -+++ lib/system.h 2006-10-22 11:09:58 +0200 ++++ lib/system.h 2006-10-24 13:18:23 +0200 @@ -425,7 +425,7 @@ #include <intprops.h> @@ -37,7 +58,7 @@ Index: src/userspec.c --- src/userspec.c.orig 2005-05-19 11:25:58 +0200 -+++ src/userspec.c 2006-10-22 11:09:19 +0200 ++++ src/userspec.c 2006-10-24 13:18:23 +0200 @@ -22,6 +22,7 @@ #include <system.h> @@ . patch -p0 <<'@@ .' Index: openpkg-src/cpio/cpio.spec ============================================================================ $ cvs diff -u -r1.34 -r1.35 cpio.spec --- openpkg-src/cpio/cpio.spec 22 Oct 2006 09:58:24 -0000 1.34 +++ openpkg-src/cpio/cpio.spec 24 Oct 2006 11:31:24 -0000 1.35 @@ -33,7 +33,7 @@ Group: Archiver License: GPL Version: 2.7 -Release: 20061022 +Release: 20061024 # list of sources Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org