Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3d31709
Further cleanup of paths
Vsevolod Stakhov committed 1 year ago
commit 3d3170928afff56c0fc38a4fff70f7097038e8a6
parent abb653c
2 files changed +15 -3
modified libpkg/Makefile.autosetup
@@ -103,7 +103,6 @@ STATIC_LIBS= @REPOS_STATIC_LIBS@ \
		$(top_builddir)/external/blake2/libblake2.a \

		$(top_builddir)/external/liblua/liblua.a \

		$(top_builddir)/compat/libbsd_compat.a \
- 
		$(top_builddir)/external/libcurl/libcurl.a \

		$(top_builddir)/external/libder/libder.a \

		$(top_builddir)/external/libecc/libecc.a \

		lib$(LIB).a
@@ -167,6 +166,7 @@ LOCAL_LDFLAGS+= @PKG_LIBCURL_LDFLAGS@ @PKG_LIBCURL_LIBS@
@else

LOCAL_CFLAGS+=	-I$(top_srcdir)/external/curl/include

LOCAL_LDFLAGS+=	-L$(top_builddir)/external/libcurl -lcurl_pic
+ 
STATIC_LIBS+=	$(top_builddir)/external/libcurl/libcurl.a

@endif



VPATH=	$(top_srcdir)/libpkg
modified src/Makefile.autosetup
@@ -47,7 +47,7 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
		-DHAVE_CONFIG_H \

		-Werror=switch

LIBPKGFLAT=	-L$(top_builddir)/libpkg -lpkg_flat
- 
OTHER_LIBS=	@EXTRA_LIBS@ -lssl -lcrypto
+ 
OTHER_LIBS=	@EXTRA_LIBS@ -lm -pthread



@if HAVE_PKG_LIBARCHIVE

OTHER_LIBS+=	@PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS_STATIC@
@@ -55,23 +55,35 @@ LOCAL_CFLAGS+= @PKG_LIBARCHIVE_CFLAGS@
@else

OTHER_LIBS+=	-larchive -lbz2 -lz -llzma @ZSTDLIB@

@endif
- 
OTHER_LIBS+=	-lm -pthread
+ 


@if HAVE_LIBUTIL

OTHER_LIBS+=	-lutil

@endif
+ 


@if HAVE_LIBFTS

OTHER_LIBS+=	-lfts

@endif
+ 


@if HAVE_LIBDL

OTHER_LIBS+=	-ldl

@endif
+ 


@if HAVE_LIBRESOLV

OTHER_LIBS+=	-lresolv

@endif
+ 


@if HAVE_LIBMD

OTHER_LIBS+=	-lmd

@endif
+ 
@if PKG_OPENSSL_LIBS
+ 
LOCAL_CFLAGS+=	@PKG_OPENSSL_CFLAGS@
+ 
LOCAL_LDFLAGS+=	@PKG_OPENSSL_LDFLAGS@
+ 
OTHER_LIBS+=	@PKG_OPENSSL_LIBS@
+ 
@else
+ 
OTHER_LIBS+=	-lssl -lcrypto
+ 
@endif
+ 


@if libmachista

LOCAL_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv

STATIC_LDFLAGS=	$(LIBPKGFLAT) $(LIBS) $(OTHER_LIBS) -lresolv