svn commit: r340997 - head/lib/libarchive

[Justin Hibbits]

On Mon, Nov 26, 2018 at 3:45 PM Martin Matuska <mm at freebsd.org> wrote:
>
> Author: mm
> Date: Mon Nov 26 21:45:27 2018
> New Revision: 340997
> URL: https://svnweb.freebsd.org/changeset/base/340997
>
> Log:
>   libarchive configuration changes
>   - move HAVE_BZLIB_H, HAVE_LIBLZMA and HAVE_LZMA_H to config_freebsd.h
>   - activate support for multi-threaded lzma encoding [1]
>
>   PR:           233543 [1]
>   Reported by:  cem
>   MFC after:    1 week
>
> Modified:
>   head/lib/libarchive/Makefile
>   head/lib/libarchive/config_freebsd.h
>
> Modified: head/lib/libarchive/Makefile
> ==============================================================================
> --- head/lib/libarchive/Makefile        Mon Nov 26 20:56:05 2018        (r340996)
> +++ head/lib/libarchive/Makefile        Mon Nov 26 21:45:27 2018        (r340997)
> @@ -7,7 +7,6 @@ _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.
>
> Modified: head/lib/libarchive/config_freebsd.h
> ==============================================================================
> --- head/lib/libarchive/config_freebsd.h        Mon Nov 26 20:56:05 2018        (r340996)
> +++ head/lib/libarchive/config_freebsd.h        Mon Nov 26 21:45:27 2018        (r340997)
> @@ -133,14 +133,17 @@
>  #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
>

This breaks ports-mgmt/pkg now, with the following failure log:

--- 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'
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:233:
undefined reference to `pthread_condattr_setclock'
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237:
undefined reference to `pthread_condattr_destroy'
/usr/lib/liblzma.a(stream_encoder_mt.o): In function `get_thread':
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237:
undefined reference to `pthread_condattr_destroy'
/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:233:
undefined reference to `pthread_condattr_setclock'
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237:
undefined reference to `pthread_condattr_destroy'
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:230:
undefined reference to `pthread_condattr_init'
/usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237:
undefined reference to `pthread_condattr_destroy'
*** [pkg-static] Error code 1

- Justin