4386e99 Fix external libarchive support — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix external libarchive support

Vsevolod Stakhov committed 1 year ago

commit 4386e99608549a9c00dba2f43e3dff989631b9d9
parent 9c4434c

2 files changed +6 -1

modified libpkg/repo/binary/Makefile.autosetup

@@ -18,4 +18,8 @@ LOCAL_CFLAGS= -I$(top_srcdir)/libpkg \

 VPATH=	$(top_srcdir)/libpkg/repo/binary
 @if HAVE_PKG_LIBARCHIVE
 LOCAL_CFLAGS+=	@PKG_LIBARCHIVE_CFLAGS@
 @endif
 include $(MK)/static-lib.mk

modified src/Makefile.autosetup

@@ -51,6 +51,7 @@ OTHER_LIBS= @EXTRA_LIBS@ -lssl -lcrypto

 @if HAVE_PKG_LIBARCHIVE
 OTHER_LIBS+=	@PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS_STATIC@
 LOCAL_CFLAGS+=	@PKG_LIBARCHIVE_CFLAGS@
 @else
 OTHER_LIBS+=	-larchive -lbz2 -lz -llzma @ZSTDLIB@
 @endif

@@ -75,7 +76,7 @@ OTHER_LIBS+= -lmd

 LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
 STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv
 # OSX doesn't support static binaries, sigh
 STATIC_ARG=
 STATIC_ARG=
 @else
 LOCAL_LDFLAGS=	-Wl,-Bstatic \
 		@waflags@ $(LIBPKGFLAT) @nowaflags@ \