Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 933c24b
Merge pull request #269 from infracaninophile/static-compile
Baptiste Daroussin committed 13 years ago
commit 933c24bb9b42abda0a53fc4de8be48dac2f81537
parent 6f8b8f0
3 files changed +8 -0
modified libpkg/Makefile
@@ -43,6 +43,7 @@ CFLAGS+= -std=c99
CFLAGS+=	-I${.CURDIR} \

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

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

LDADD+=		-L${.OBJDIR}/../external/sqlite \

		-L${.OBJDIR}/../external/libyaml \

		-lsqlite3 \
modified libpkg/pkg_elf.c
@@ -57,6 +57,12 @@ test_depends(struct pkgdb *db, struct pkg *pkg, const char *name)
	bool shlibs = false;

	bool autodeps = false;
+ 
#ifdef STATIC_LINKAGE
+ 
	/* If we're compiled using static linkage, ie. as pkg-static,
+ 
	   calls to dlopen(3) will fail, so bail out immediately. */
+ 
	return (EPKG_OK);
+ 
#endif
+ 


	pkg_config_bool(PKG_CONFIG_AUTODEPS, &autodeps);

	pkg_config_bool(PKG_CONFIG_SHLIBS, &shlibs);
modified pkg-static/Makefile
@@ -1,5 +1,6 @@
PROG=pkg-static
+ 
CFLAGS+=	-DSTATIC_LINKAGE

STATIC_PKGNG=	yes

NO_SHARED?=	yes

NO_MAN=		yes