Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › a63eab3
Do not build twice pkg object to get pkg-static
Baptiste Daroussin committed 12 years ago
commit a63eab370cba37fb496d014f4ec3d2df28fc0733
parent 8511609
4 files changed +38 -46
modified .gitignore
@@ -12,8 +12,8 @@
tags

TAGS

pkg/pkg
+ 
pkg/pkg-static

pkg2legacy
- 
pkg-static/pkg-static

tests/test

tests/lib/test

tests/lib/pkg_printf.c
modified Makefile
@@ -6,10 +6,6 @@ SUBDIR= external \


NEWVERS=	${.CURDIR}/newvers.sh
- 
.if !defined(NOSTATIC)
- 
SUBDIR+=	pkg-static
- 
.endif
- 


ATF_INSTALLED!=	which atf-version 2>&1 || echo



.if !empty(ATF_INSTALLED)
deleted pkg-static/Makefile
@@ -1,37 +0,0 @@
- 
PROG=pkg-static
-
- 
STATIC_PKGNG=	yes
- 
NO_SHARED?=	yes
- 
NO_MAN=		yes
- 
NOMAN=		yes
- 
LDADD_STATIC=	-L../external/sqlite \
- 
		-L../external/libyaml \
- 
		-L../external/libucl
-
- 
.if defined(WITH_BUNDLED_LIBELF)
- 
LDADD_STATIC+=	-L../external/libelf
- 
.endif
-
- 
LDADD_STATIC+=	-lsqlite3 \
- 
		-larchive \
- 
		-lsbuf \
- 
		-lfetch \
- 
		-lpthread \
- 
		-lelf \
- 
		-lssl \
- 
		-lcrypto \
- 
		-lmd \
- 
		-lz \
- 
		-lbz2 \
- 
		-llzma \
- 
		-lyaml \
- 
		-lucl
-
- 
.if exists(/usr/include/edit/readline/readline.h)
- 
LDADD_STATIC+=	-ledit \
- 
		-lncursesw
- 
.endif
-
- 
.PATH:		${.CURDIR}/../pkg/
-
- 
.include "${.CURDIR}/../pkg/Makefile"
modified pkg/Makefile
@@ -73,8 +73,26 @@ LDADD+= -L../libpkg \
		-lz \

		-lbz2 \

		-llzma \
- 
		-lexpat \
- 
		${LDADD_STATIC}
+ 
		-lexpat
+
+ 
LDADD_STATIC=	-L../external/sqlite \
+ 
		-L../external/libyaml \
+ 
		-L../external/libucl
+
+ 
LDADD_STATIC+=	-lsqlite3 \
+ 
		-larchive \
+ 
		-lsbuf \
+ 
		-lfetch \
+ 
		-lpthread \
+ 
		-lelf \
+ 
		-lssl \
+ 
		-lcrypto \
+ 
		-lmd \
+ 
		-lz \
+ 
		-lbz2 \
+ 
		-llzma \
+ 
		-lyaml \
+ 
		-lucl



.if !exists(/usr/include/jail.h)

CFLAGS+=	-DNO_LIBJAIL
@@ -82,8 +100,9 @@ CFLAGS+= -DNO_LIBJAIL
LDADD+=		-ljail

.endif
- 
.if !defined(STATIC_PKGNG)
- 
LDFLAGS+=	-Wl,-rpath=/usr/lib:${PREFIX}/lib
+ 
.if exists(/usr/include/edit/readline/readline.h)
+ 
LDADD_STATIC+=	-ledit \
+ 
		-lncursesw

.endif



WARNS?=		6
@@ -128,3 +147,17 @@ fix-xrefs:
	@./fix-xrefs ${MAN}



.include <bsd.prog.mk>
+
+ 
${PROG}: ${PROGNAME}-static
+
+ 
LDFLAGS_STATIC:=	-static ${LDFLAGS}
+ 
LDFLAGS+=	-Wl,-rpath=/usr/lib:${PREFIX}/lib
+
+ 
${PROGNAME}-static: ${OBJS}
+ 
	${CC} -static ${CFLAGS} ${LDFLAGS_STATIC} -o ${.TARGET} ${OBJS} ${LDADD} ${LDADD_STATIC}
+
+ 
realinstall: ${PROGNAME}-static-install
+
+ 
${PROGNAME}-static-install:
+ 
	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 
		${_INSTALLFLAGS} ${PROG}-static ${DESTDIR}${BINDIR}/${PROGNAME}-static