Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 39b870b
Handle proper rebuild depending on dependant .a
Baptiste Daroussin committed 12 years ago
commit 39b870b2111e61e88b2256f1a63719cd92773bdd
parent a63eab3
2 files changed +22 -5
modified libpkg/Makefile
@@ -82,10 +82,8 @@ CFLAGS+= -I. \
		-I${.CURDIR} \

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

		-I${.CURDIR}/../external/uthash \
- 
		-I${.CURDIR}/../external/libucl/include
-
- 
CFLAGS+=	-I ${.CURDIR}/../external/libyaml/include
- 
LDADD+=		-L../external/libyaml -lyaml
+ 
		-I${.CURDIR}/../external/libucl/include \
+ 
		-I${.CURDIR}/../external/libyaml/include



.if defined(WITH_BUNDLED_LIBELF)

CFLAGS+=	-I${.CURDIR}/../external/libelf \
@@ -98,6 +96,7 @@ LDADD+= -L../external/sqlite \


.if defined(WITH_BUNDLED_LIBELF)

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

.endif



LDADD+=		-lsqlite3 \
@@ -107,7 +106,12 @@ LDADD+= -lsqlite3 \
		-lelf \

		-lutil \

		-lpthread \
- 
		-lucl
+ 
		-lucl \
+ 
		-lyaml
+
+ 
DPADD+=		${.OBJDIR}/../external/sqlite/libsqlite3.a \
+ 
		${.OBJDIR}/../external/libyaml/libyaml.a \
+ 
		${.OBJDIR}/../external/libucl/libucl.a



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

LDADD+=		-ledit
@@ -143,3 +147,9 @@ NOMAN= yes
	sed -e "s,__PREFIX__,${PREFIX},g" \

	    -e "s,__VERSION__,${PKGVERSION},g" \

	    ${.IMPSRC} > ${.TARGET}
+
+
+ 
afterdepend:
+ 
.if defined(DPADD) && !empty(DPADD)
+ 
	grep -q "^lib${LIB}.a:" ${DEPENDFILE} || echo lib${LIB}.a: ${DPADD} >> ${DEPENDFILE}
+ 
.endif
modified pkg/Makefile
@@ -105,6 +105,8 @@ LDADD_STATIC+= -ledit \
		-lncursesw

.endif
+ 
DPADD_STATIC=	${.OBJDIR}/../libpkg/libpkg.a
+ 


WARNS?=		6

MAN=	pkg.8 \

	pkg-add.8 \
@@ -161,3 +163,8 @@ realinstall: ${PROGNAME}-static-install
${PROGNAME}-static-install:

	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \

		${_INSTALLFLAGS} ${PROG}-static ${DESTDIR}${BINDIR}/${PROGNAME}-static
+
+ 
afterdepend:
+ 
.if defined(DPADD_STATIC) && !empty(DPADD_STATIC)
+ 
	grep -q "^${PROGNAME}-static:" ${DEPENDFILE} || echo ${PROGNAME}-static: ${DPADD_STATIC} >> ${DEPENDFILE}
+ 
.endif