openpkg/libarchive.patch

changeset 428
f880f219c566
child 431
127559aa0c5e
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/openpkg/libarchive.patch	Tue Jul 31 12:23:42 2012 +0200
     1.3 @@ -0,0 +1,33 @@
     1.4 +Index: Makefile.in
     1.5 +--- Makefile.in.orig	2011-12-24 19:05:17.000000000 +0100
     1.6 ++++ Makefile.in	2011-12-26 08:30:54.000000000 +0100
     1.7 +@@ -1091,7 +1091,7 @@
     1.8 + lib_LTLIBRARIES = libarchive.la
     1.9 + noinst_LTLIBRARIES = libarchive_fe.la
    1.10 + man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
    1.11 +-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h
    1.12 ++BUILT_SOURCES =
    1.13 + TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
    1.14 + # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
    1.15 + DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
    1.16 +Index: cpio/cmdline.c
    1.17 +--- cpio/cmdline.c.orig	2011-12-24 18:56:24.000000000 +0100
    1.18 ++++ cpio/cmdline.c	2011-12-26 08:29:08.000000000 +0100
    1.19 +@@ -56,7 +56,7 @@
    1.20 + /*
    1.21 +  * Long options for cpio.  Please keep this sorted.
    1.22 +  */
    1.23 +-static const struct option {
    1.24 ++static const struct libarchive_option {
    1.25 + 	const char *name;
    1.26 + 	int required;	/* 1 if this option requires an argument */
    1.27 + 	int equivalent;	/* Equivalent short option. */
    1.28 +@@ -104,7 +104,7 @@
    1.29 + 	static int state = state_start;
    1.30 + 	static char *opt_word;
    1.31 + 
    1.32 +-	const struct option *popt, *match = NULL, *match2 = NULL;
    1.33 ++	const struct libarchive_option *popt, *match = NULL, *match2 = NULL;
    1.34 + 	const char *p, *long_prefix = "--";
    1.35 + 	size_t optlength;
    1.36 + 	int opt = '?';

mercurial