Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9c4434c
Allow to build with external libcurl
Vsevolod Stakhov committed 1 year ago
commit 9c4434cd4ae7408b1189cb2bb4962134f1d4cc6d
parent c1db5ac
3 files changed +18 -3
modified auto.def
@@ -19,6 +19,7 @@ options {
	with-asan => "build with libasan support"

	with-lsan => "build with liblsan support"

	with-ubsan => "Build with libubsan support"
+ 
	with-libcurl => "Build with external libcurl"

	default-format:txz => "Default compression format: tzst (default), txz, tbz, tar"

}
@@ -330,6 +331,11 @@ if {[pkg-config-init 0]} {
			define PKG_LIBDNS_LIBS_STATIC [exec pkg-config --static --libs-only-l libldns]

		}

	}
+ 
	if {[opt-bool with-libcurl]} {
+ 
		if {![pkg-config libcurl]} {
+ 
			user-error "Unable to find libcurl"
+ 
		}
+ 
	}

	if {[opt-bool with-libarchive.pc]} {

		if {![pkg-config libarchive]} {

			user-error "Unable to find libarchive"
modified external/Makefile.autosetup
@@ -1,9 +1,12 @@
include @builddir@/mk/defs.mk
- 
DIRS=	blake2 picosat linenoise sqlite libucl liblua yxml libcurl libder libecc
+ 
DIRS=	blake2 picosat linenoise sqlite libucl liblua yxml libder libecc

@if libmachista

DIRS+=	libmachista

@endif

@if libelf-internal

DIRS+=	libelf

@endif
+ 
@if !PKG_LIBCURL_LIBS
+ 
DIRS+=	libcurl
+ 
@endif

include $(MK)/dir.mk
modified libpkg/Makefile.autosetup
@@ -62,7 +62,6 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
		-I$(top_srcdir)/external/yxml \

		-I$(top_srcdir)/external/include \

		-I$(top_srcdir)/external/libucl/include \
- 
		-I$(top_srcdir)/external/curl/include \

		-I$(top_srcdir)/external/lua/src \

		-I$(top_srcdir)/external/liblua/ \

		-I$(top_srcdir)/external/libder/libder \
@@ -89,7 +88,6 @@ LOCAL_LDFLAGS= @waflags@ \
		-L$(top_builddir)/external/yxml -lyxml_pic \

		-L$(top_builddir)/external/blake2 -lblake2_pic \

		-L$(top_builddir)/compat -lbsd_compat_pic \
- 
		-L$(top_builddir)/external/libcurl -lcurl_pic \

		-L$(top_builddir)/external/liblua -llua_pic \

		-L$(top_builddir)/external/libder -lder_pic \

		-L$(top_builddir)/external/libecc -lecc_pic \
@@ -158,6 +156,14 @@ LOCAL_CFLAGS+= @PKG_LIBLDNS_CFLAGS@
LOCAL_LDFLAGS+=	@PKG_LIBLDNS_LDFLAGS@ @PKG_LIBLDNS_LIBS@

@endif
+ 
@if PKG_LIBCURL_LIBS
+ 
LOCAL_CFLAGS+=	@PKG_LIBCURL_CFLAGS@
+ 
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
+ 
@endif
+ 


VPATH=	$(top_srcdir)/libpkg



include $(MK)/lib.mk