Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dfff2c3
Autodetect if bundled libelf is necessary
Baptiste Daroussin committed 12 years ago
commit dfff2c35290d7ce357a1e51f4914306f7662fbfa
parent 440f149
3 files changed +6 -3
modified external/Makefile
@@ -1,6 +1,6 @@
SUBDIR=	sqlite libyaml expat libucl
- 
.if defined(WITH_BUNDLED_LIBELF)
+ 
.if !exists(/usr/lib/libelf.so)

SUBDIR+= libelf

.endif
modified libpkg/Makefile
@@ -85,7 +85,7 @@ CFLAGS+= -I. \
		-I${.CURDIR}/../external/libucl/include \

		-I${.CURDIR}/../external/libyaml/include
- 
.if defined(WITH_BUNDLED_LIBELF)
+ 
.if !exists(/usr/lib/libelf.so)

CFLAGS+=	-I${.CURDIR}/../external/libelf \

		-DBUNDLED_LIBELF

.endif
@@ -94,7 +94,7 @@ LDADD+= -L../external/sqlite \
		-L../external/libyaml \

		-L../external/libucl
- 
.if defined(WITH_BUNDLED_LIBELF)
+ 
.if !exists(/usr/lib/libelf.so)

LDADD+=		-L../external/libelf

DPADD+=		${.OBJDIR}/external/libelf/libelf.a

.endif
modified pkg/Makefile
@@ -58,6 +58,9 @@ DEBUG_FLAGS+= -pg
CFLAGS+=	-I../libpkg \

		-I${.CURDIR}/../external/uthash \

		-I${.CURDIR}/../external/expat/lib
+ 
.if !exists(/usr/lib/libelf.so)
+ 
LDADD_STATIC+=		-L../external/libelf
+ 
.endif

LDADD+=		-L../libpkg \

		-L../external/expat \

		-ledit \