diff options
| author | Sean Bruno <sbruno@FreeBSD.org> | 2018-12-04 03:23:14 +0000 |
|---|---|---|
| committer | Sean Bruno <sbruno@FreeBSD.org> | 2018-12-04 03:23:14 +0000 |
| commit | 8dfd9dcd55768f04ce1ade7c38ae9aa9e6bf5f3e (patch) | |
| tree | 7afdabf5b5dbbab8ef77a9124fa75a694249634f /lib/libarchive | |
| parent | 1b5dbfa8a0b1e05b0b57c661f19662fef3537c02 (diff) | |
| download | src-test-8dfd9dcd55768f04ce1ade7c38ae9aa9e6bf5f3e.tar.gz src-test-8dfd9dcd55768f04ce1ade7c38ae9aa9e6bf5f3e.zip | |
Revert r340997 at the request of multiple users.
- breaks ports-mgmt/pkg build for mips64, powerpc64 and i386 for some users.
--- pkg-static ---
/usr/lib/liblzma.a(stream_encoder_mt.o): In function `mythread_cond_init':
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:230:
undefined reference to `pthread_condattr_init'
Reported by: jhibbits zeising
Notes
Notes:
svn path=/head/; revision=341453
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 1 | ||||
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index d3204e1f2208b..634ef7157be44 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -7,6 +7,7 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive LIB= archive LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 3ff4930d339e9..99f50150605ef 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -133,17 +133,14 @@ #define HAVE_LCHFLAGS 1 #define HAVE_LCHMOD 1 #define HAVE_LCHOWN 1 -#define HAVE_LIBLZMA 1 #define HAVE_LIBZ 1 #define HAVE_LIMITS_H 1 #define HAVE_LINK 1 -#define HAVE_LZMA_H 1 #define HAVE_LOCALE_H 1 #define HAVE_LOCALTIME_R 1 #define HAVE_LONG_LONG_INT 1 #define HAVE_LSTAT 1 #define HAVE_LUTIMES 1 -#define HAVE_LZMA_STREAM_ENCODER_MT 1 #define HAVE_MBRTOWC 1 #define HAVE_MEMMOVE 1 #define HAVE_MEMORY_H 1 |