Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2cfb4f7
Fix to really use libcurl from pkg-config
Keve committed 1 year ago
commit 2cfb4f76fa9e23ab714a1432aff04bf5882b0d08
parent 45c3522
3 files changed +9 -3
modified libpkg/repo/binary/Makefile.autosetup
@@ -22,4 +22,9 @@ VPATH= $(top_srcdir)/libpkg/repo/binary
LOCAL_CFLAGS+=	@PKG_LIBARCHIVE_CFLAGS@

@endif
+ 
@if HAVE_PKG_LIBCURL
+ 
LOCAL_CFLAGS+=	@PKG_LIBCURL_CFLAGS@
+ 
@endif
+
+ 


include $(MK)/static-lib.mk
modified src/Makefile.autosetup
@@ -85,8 +85,7 @@ OTHER_LIBS+= -lssl -lcrypto


@if PKG_LIBCURL_LIBS

LOCAL_CFLAGS+=	@PKG_LIBCURL_CFLAGS@
- 
LOCAL_LDFLAGS+=	@PKG_LIBCURL_LDFLAGS@
- 
OTHER_LIBS+=	@PKG_LIBCURL_LIBS@
+ 
OTHER_LIBS+=	@PKG_LIBCURL_LDFLAGS@ @PKG_LIBCURL_LIBS@

@endif



@if libmachista
modified tests/Makefile.autosetup
@@ -124,7 +124,7 @@ LIBS+= @PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS@
@else

LIBS+=	-L/usr/lib -larchive -lbz2 -lz -llzma

@endif
- 
OTHER_LIBS=	-lssl -lcrypto -pthread
+ 
OTHER_LIBS=	-pthread

@if HAVE_LIBUTIL

OTHER_LIBS+=	-lutil

@endif
@@ -144,6 +144,8 @@ LIBS+= @PKG_LIBCURL_LDFLAGS@ @PKG_LIBCURL_LIBS@
@if PKG_OPENSSL_LIBS

CFLAGS+=	@PKG_OPENSSL_CFLAGS@

LIBS+=	@PKG_OPENSSL_LDFLAGS@ @PKG_OPENSSL_LIBS@
+ 
@else
+ 
OTHER_LIBS+=	-lssl -lcrypto

@endif