diff -r 71503088f51b -r f880f219c566 openpkg/libarchive.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/openpkg/libarchive.patch Tue Jul 31 12:23:42 2012 +0200 @@ -0,0 +1,33 @@ +Index: Makefile.in +--- Makefile.in.orig 2011-12-24 19:05:17.000000000 +0100 ++++ Makefile.in 2011-12-26 08:30:54.000000000 +0100 +@@ -1091,7 +1091,7 @@ + lib_LTLIBRARIES = libarchive.la + noinst_LTLIBRARIES = libarchive_fe.la + man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) +-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h ++BUILT_SOURCES = + TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) + # Always build and test both bsdtar and bsdcpio as part of 'distcheck' + DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio +Index: cpio/cmdline.c +--- cpio/cmdline.c.orig 2011-12-24 18:56:24.000000000 +0100 ++++ cpio/cmdline.c 2011-12-26 08:29:08.000000000 +0100 +@@ -56,7 +56,7 @@ + /* + * Long options for cpio. Please keep this sorted. + */ +-static const struct option { ++static const struct libarchive_option { + const char *name; + int required; /* 1 if this option requires an argument */ + int equivalent; /* Equivalent short option. */ +@@ -104,7 +104,7 @@ + static int state = state_start; + static char *opt_word; + +- const struct option *popt, *match = NULL, *match2 = NULL; ++ const struct libarchive_option *popt, *match = NULL, *match2 = NULL; + const char *p, *long_prefix = "--"; + size_t optlength; + int opt = '?';