Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f86a2b7
Branch libucl to the build
Baptiste Daroussin committed 12 years ago
commit f86a2b755f5a94da07e0e0e22ac2de45795f15ef
parent f30c809
2 files changed +10 -5
modified libpkg/Makefile
@@ -81,7 +81,8 @@ CFLAGS+= -std=c99
CFLAGS+=	-I. \

		-I${.CURDIR} \

		-I${.CURDIR}/../external/sqlite \
- 
		-I${.CURDIR}/../external/uthash
+ 
		-I${.CURDIR}/../external/uthash \
+ 
		-I${.CURDIR}/../external/libucl/include



CFLAGS+=	-I ${.CURDIR}/../external/libyaml/include

LDADD+=		-L../external/libyaml -lyaml
@@ -92,7 +93,8 @@ CFLAGS+= -I${.CURDIR}/../external/libelf \
.endif



LDADD+=		-L../external/sqlite \
- 
		-L../external/libyaml
+ 
		-L../external/libyaml \
+ 
		-L../external/libucl



.if defined(WITH_BUNDLED_LIBELF)

LDADD+=		-L../external/libelf
@@ -104,7 +106,8 @@ LDADD+= -lsqlite3 \
		-lfetch \

		-lelf \

		-lutil \
- 
		-lpthread
+ 
		-lpthread \
+ 
		-lucl



.if exists(/usr/include/edit/readline/readline.h)

LDADD+=		-ledit
modified pkg-static/Makefile
@@ -5,7 +5,8 @@ NO_SHARED?= yes
NO_MAN=		yes

NOMAN=		yes

LDADD_STATIC=	-L../external/sqlite \
- 
		-L../external/libyaml
+ 
		-L../external/libyaml \
+ 
		-L../external/libucl



.if defined(WITH_BUNDLED_LIBELF)

LDADD_STATIC+=	-L../external/libelf
@@ -23,7 +24,8 @@ LDADD_STATIC+= -lsqlite3 \
		-lz \

		-lbz2 \

		-llzma \
- 
		-lyaml
+ 
		-lyaml \
+ 
		-lucl



.if exists(/usr/include/edit/readline/readline.h)

LDADD_STATIC+=	-ledit \