Commit Graph

113 Commits

Author SHA1 Message Date
Brad King 41b7b3efa4 libarchive: Define major/minor/makedev only where needed (#11648)
If neither MAJOR_IN_MKDEV or MAJOR_IN_SYSMACROS is defined then provide
our own implementation of these macros locally.  This complements the
change in commit cf5ad183 (Fix major() check for LSB 4.0, 2011-01-12).
This patch is based on upstream libarchive SVN commit 1553 (Shuffle the
major/minor/makedev support a bit; this should work on both Windows and
Haiku, 2009-10-31).

Inspired-by: Tim Kientzle <kientzle@freebsd.org>
2011-02-07 10:06:50 -05:00
Brad King cf5ad18340 libarchive: Fix major() check for LSB 4.0 (#11648)
The LSB header files define major() as a macro but if it is ever called
the macro references symbols not available at link time.  Improve the
test for major() to actually call the macro and try to link.  This
approach is based on upstream libarchive SVN commit 2866 which fixed
libarchive issue 125, submitted in response to CMake issue #11648.

Inspired-by: Tim Kientzle <kientzle@freebsd.org>
2011-01-12 13:52:14 -05:00
David Cole 745671441d Merge topic 'fix_osf_build'
92c082b Add a fix for the inline keyword on the osf os.
bd56626 Fixes for the OSF operating system build.
2010-11-09 15:53:55 -05:00
Bill Hoffman 92c082b1c9 Add a fix for the inline keyword on the osf os. 2010-09-10 13:37:02 -04:00
Brad King b9c41813d2 libarchive: Fix purposeful crash
Dereferencing a 0-pointer is undefined behavior, not a deterministic
crash.  Use a 1-pointer instead.  This also avoids a warning by Clang
about the undefined behavior.
2010-09-10 09:00:48 -04:00
Bill Hoffman bd56626a4a Fixes for the OSF operating system build. 2010-09-08 14:50:14 -04:00
Brad King e87b6bbddb libarchive: Remove SCHILY dev,ino,nlink attributes (#11176)
At least one version of GNU tar (1.15.1 with Fedora patches) does not
recognize these attributes and exits with error.  Do not generate them.
Patch from upstream libarchive svn r2563.
2010-08-27 09:15:29 -04:00
Bill Hoffman aa1450bda1 Fix build on borland windows, by adding back typedef for pid_t. 2010-05-06 08:48:14 -04:00
Ruben Van Boxem 7883f952b0 Win64 fixes for mingw-w64 compilation 2010-05-05 17:13:21 -04:00
Bill Hoffman 1c13ced6eb Fix prototype to match header, for bug # 10543. 2010-05-05 09:34:57 -04:00
Bill Hoffman d6a6eadcfe For HP, preprocessor if on multiple lines not allowed, make a long line. 2010-05-04 15:52:00 -04:00
Bill Hoffman a18612429d Fixes for bug # 10543, build on older sunpro now works. 2010-05-04 14:52:22 -04:00
Bill Hoffman 38524ec8d1 Remove another c++ comment from the c code. 2010-04-27 21:27:26 -04:00
Bill Hoffman 2e188ef1ff Get rid of c++ style comments in C code. 2010-04-27 17:45:40 -04:00
Brad King 68374fe078 libarchive: Drop unused %jd and %lld checks
The libarchive source does not use HAVE_PRINTF_JD or HAVE_PRINTF_LLD, so
we do not need to test for them at configuration time.
2009-12-14 17:26:47 -05:00
Brad King 8b2f6dbfa2 libarchive: Remove unused STDC_HEADERS try_run
This was the only try_run() in libarchive, and the result was not used
in the source code.  We remove it to allow cross-compiling to work.
2009-11-30 17:22:24 -05:00
Brad King 9e852190b3 libarchive: Use one architecture for try-compiles
We use CHECK_TYPE_SIZE in libarchive to check for the existence of some
types.  For universal binary builds on the Mac, the size check can fail
if it is inconsistent across architectures.  However, we do not actually
need the size so it is safe to do the checks for only one architecture.

See issue #9913.
2009-11-23 11:30:58 -05:00
Brad King 8cb1f4b0a4 libarchive: Include integer types very early
In libarchive/archive_platform.h we should include <stdint.h> or
<inttypes.h> immediately after "config.h" to define integer types
referenced by configuration results.  For example, on a non-conformant
platform ssize_t might default to int64_t, so int64_t must be defined
before ssize_t is used (and ssize_t is used in archive_windows.h).
2009-11-18 15:50:24 -05:00
Bill Hoffman f8b9a2681b for the Cmake build we do not want to have -Werror or force -Wall 2009-11-13 22:48:31 -05:00
Bill Hoffman bd60a2469a remove the last of the windows W4 warnings 2009-11-12 10:17:55 -05:00
Bill Hoffman d91d04a47a Remove a few more warnings 2009-11-12 07:42:21 -05:00
Brad King 8cf5af0645 libarchive: Borland provides umask, not _umask 2009-11-10 16:27:42 -05:00
Bill Hoffman 0106b490de keep libarchive from using a system zlib unless cmake uses one 2009-11-09 14:42:23 -05:00
Brad King 665ac8d4a4 libarchive: Put local include dir first
In libarchive we configure an internal header file called 'config.h'.
This commits moves the include directory containing the file to the
beginning of the include path to avoid conflicts from system headers.
2009-11-09 13:38:29 -05:00
Bill Hoffman 739d692e72 try to get rid of some warnings on hpux 2009-11-08 17:39:39 -05:00
Bill Hoffman f5ff79e8bd remove a few more windows warnings 2009-11-08 15:10:34 -05:00
Bill Hoffman a73acfbeb9 Fix for mode_t with signed types 2009-11-07 19:34:24 -05:00
Bill Hoffman bc701c59de link in additional libraries that the configure step finds 2009-11-07 10:52:40 -05:00
Bill Hoffman 8111b06078 Fix hpux build on heart 2009-11-06 12:13:36 -05:00
Brad King 5a509ab6ae libarchive: Fix get(pw|gr)name_r comment
The commit "libarchive: Define _XOPEN_SOURCE for get(pwu|grg)id_r"
introduced a comment referring to get(pwu|grg)id_r in a source file that
actually uses the functions get(pw|gr)name_r.  We fix the comment.
2009-11-06 10:54:25 -05:00
Brad King 76f8504596 libarchive: Initialize passwd/group lookup result
The "result" argument to functions get(pwu|grg)id_r and get(pw|gr)name_r
does not appear in the signatures provided on older platforms.  We set
the pointer to the result memory in case the function ignores it, thus
ensuring initialization.
2009-11-06 10:54:10 -05:00
Brad King db05eb1b3c libarchive: Fix try-compile for SIZE_MAX
This constant may be defined in one of a few headers.  We teach the
try-compile for it to test all the headers together instead of only one
header.
2009-11-05 16:29:30 -05:00
Brad King d7ef7e9416 libarchive: Add try-compile for 'major'
The commit "Fix libarchive linker errors on SunOS for mkdev/major/minor"
hard-coded #include lines for getting mkdev/major/minor on the Sun.
Instead we add missing try-compile tests to make sure the proper headers
get included through the standard mechanism.
2009-11-05 16:29:21 -05:00
Brad King fe598550aa libarchive: Define _XOPEN_SOURCE for get(pwu|grg)id_r
The commit "Fixed a few of the SunOS build errors in libarchive" changed
the call to these functions to use the old signatures.  Instead we now
define _XOPEN_SOURCE to get the improved modern signatures.
2009-11-05 16:29:10 -05:00
Bill Hoffman 7eac77605d Do not use external lzma library as it causes link errors on several machines and we don't need it. 2009-11-05 15:54:19 -05:00
Zach Mullen ac3f37e0b6 Fix linker errors for libarchive in AIX as well. 2009-11-05 15:48:50 -05:00
Zach Mullen a01badcc7a Fix statement not reached warning for libarchive. 2009-11-05 14:15:28 -05:00
Zach Mullen 557a42a9dd Fix libarchive linker errors on SunOS for mkdev/major/minor 2009-11-05 14:06:45 -05:00
Zach Mullen 5a6cb44e96 Fixed a few of the SunOS build errors in libarchive. 2009-11-05 13:40:06 -05:00
Brad King 593bb64d16 libarchive: Use consistent function storage class
Functions declared 'static' should be defined 'static' too.
2009-11-04 17:25:35 -05:00
Brad King 4c6f63a409 libarchive: Fix integer type defaults for Windows
Most of the integer type defaults needed for MSVC and Borland actually
work with all Windows compilers.  This commit generalizes the defaults
to avoid compiler-specific tests.
2009-11-04 17:17:57 -05:00
Brad King f4b70b6323 libarchive: Provide SetFilePointerEx for VS 6 2009-11-04 16:31:40 -05:00
Brad King e5075bb8e8 libarchive: Fix unconfigured header logic
The commit "libarchive: Fix Borland integer constants" introduced use of
HAVE_* configured macros into archive.h and archive_entry.h where they
are not allowed.  This commit replaces the logic with something that
does not depend on the configured macros.
2009-11-04 16:06:44 -05:00
Brad King 7f5361f040 libarchive: Fix dev_t configuration 2009-11-04 16:06:34 -05:00
Brad King 9bc63eb30f libarchive: Fix intptr_t and uintptr_t configuration 2009-11-04 16:06:26 -05:00
Brad King d785cb0021 libarchive: Fix wincrypt.h inclusion on VS 6
The VS 6 version of wincrypt.h only works if _WIN32_WINNT >= 0x0400.
We block its inclusion through windows.h by defining NOCRYPT, and then
define _WIN32_WINNT and include it only when necessary.
2009-11-04 16:06:17 -05:00
Brad King c9a9c88634 libarchive: Fix Borland integer constants
Some versions of Borland provide <stdint.h>, so we use it when possible.
However, the 64-bit signed and unsigned integer min/max constants cause
overflow warnings from Borland itself!  For these constants we fall back
on our default definitions.
2009-11-04 13:10:11 -05:00
Brad King 12baf7b7f1 libarchive: Disable Borland warnings
We disable warnings to silence them while making minimal changes to
third-party code.
2009-11-04 13:09:59 -05:00
Brad King ccd831c559 libarchive: Disable MSVC warnings
We disable warnings to silence them while making minimal changes to
third-party code.
2009-11-04 13:09:41 -05:00
Bill Hoffman 7fba9849f9 Fix for warning on dash8 that caused a build failure because of -WError 2009-11-04 10:45:52 -05:00
Bill Hoffman 2733f4f8e7 Fix for dash17 ACL requires linking to a library acl that we don't want to depend on. 2009-11-03 17:40:44 -05:00
Bill Hoffman b9e88cd4c8 remove makefiles as they cause the in source build test of cmake to fail 2009-11-03 10:21:50 -05:00
Bill Hoffman ca73562e54 borland builds, but still has some link errors 2009-11-02 10:51:29 -05:00
Bill Hoffman 8ba2a40404 Fixes for borland, compiles with lots of warnings, but compiles, might fix vs70 again too. 2009-11-01 12:41:17 -05:00
Bill Hoffman 1db02b4d4e Fix for haiku 2009-10-31 09:39:58 -04:00
Bill Hoffman a533cc6093 Try to fix borland 2009-10-30 22:29:08 -04:00
Bill Hoffman 53082a4f34 Try to fix old hpux 2009-10-30 18:07:45 -04:00
Bill Hoffman 7ff27819de Remove unused variable to fix warning 2009-10-30 17:10:09 -04:00
Bill Hoffman 7b22ab1990 Remove unused variable to fix warning 2009-10-30 17:05:57 -04:00
Bill Hoffman 7a35b9ba3a only use archive_entry_copy_bhfi.c on windows so we don't get empty .o file warnings 2009-10-30 17:01:49 -04:00
Bill Hoffman 4e123ec1b1 Fix for VS 7 or lower not having ULL postfix for types 2009-10-30 16:36:46 -04:00
David Cole cfa5932321 Fix compile issues on Mac OSX 10.3 on midworld dashboard. 2009-10-30 16:22:08 -04:00
Bill Hoffman fb51d98562 Switch to using libarchive from libtar for cpack and cmake -E tar
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers.  The cmake -E tar xf should be
able to handle all compression types now as well.
2009-10-30 13:10:56 -04:00