Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 0f2230c
Fix build system.
Vsevolod Stakhov committed 11 years ago
commit 0f2230c3bb8e05dc362d46bc8770d797ced26c97
parent 2c654c2
3 files changed +4 -1
modified libpkg/Makefile.am
@@ -1,6 +1,7 @@
pkg_common_cflags=	-I$(top_srcdir)/libpkg \

			@LIBELF_INCLUDE@ \

			@LIBSBUF_INCLUDE@ \
+ 
			-I$(top_srcdir)/external/expat/lib \

			-I$(top_srcdir)/external/libucl/include \

			-I$(top_srcdir)/external/uthash \

			-I$(top_srcdir)/external/sqlite \
@@ -48,6 +49,7 @@ libpkg_la_CFLAGS= $(pkg_common_cflags) -shared
libpkg_la_LIBADD=	$(top_builddir)/external/libucl.la \

			$(top_builddir)/external/libsqlite.la \

			$(top_builddir)/external/libyaml.la \
+ 
			$(top_builddir)/external/libexpat.la \

			@LIBELF_LIB@ \

			@LIBSBUF_LIB@ \

			-larchive \
@@ -64,6 +66,7 @@ libpkg_static_la_SOURCES= $(libpkg_la_SOURCES)
libpkg_static_la_CFLAGS=	$(pkg_common_cflags) -static

libpkg_static_la_LIBADD=	$(top_builddir)/external/libucl_static.la \

			$(top_builddir)/external/libsqlite_static.la \
+ 
			$(top_builddir)/external/libexpat_static.la \

			$(top_builddir)/external/libyaml_static.la



libpkg_static_la_LDFLAGS=	-all-static
modified libpkg/pkg.h.in
@@ -1748,6 +1748,7 @@ int pkg_audit_process(struct pkg_audit *audit);
 * just returning a name of vulnerable package.

 * It's caller responsibility to free `result` after use

 * @return true and `*result` is set if a package is vulnerable
+ 
 */

bool pkg_audit_is_vulnerable(struct pkg_audit *audit, struct pkg *pkg,

		bool quiet, struct sbuf **result);

#endif
modified src/Makefile.am
@@ -37,7 +37,6 @@ pkg_SOURCES= add.c \
			which.c

			

pkg_LDADD=	$(top_builddir)/libpkg/libpkg.la \
- 
			$(top_builddir)/external/libexpat.la \

			@LIBJAIL_LIB@

pkg_CFLAGS=		-I$(top_srcdir)/libpkg \

			-I$(top_srcdir)/external/uthash \