Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b236be0
Fix portable build of test suite.
Landon Fuller committed 11 years ago
commit b236be02286f78e3c35e2fe68d54b5d20c1b92e3
parent 6e36cc8
2 files changed +8 -3
modified tests/Makefile.am
@@ -2,9 +2,10 @@ AUTOMAKE_OPTIONS= subdir-objects


GENERIC_LDADD=	$(top_builddir)/libpkg/libpkg_static.la \

		$(top_builddir)/external/libsbuf_static.la \
+ 
		$(top_builddir)/compat/libbsd_compat.la \
+ 
		@LDNS_LIBS@ \

		@LIBJAIL_LIB@ \

		@LIBEXECINFO_LIB@ \
- 
		-lelf \

		-lfetch \

		-larchive \

		-lutil \
@@ -14,7 +15,7 @@ GENERIC_LDADD= $(top_builddir)/libpkg/libpkg_static.la \
		-L/usr/local/lib \

		-latf-c

if LIBELF_BUNDLED
- 
GENERIC_LDADD+=	$(top_builddir)/external/libelf/libelf_static.la
+ 
GENERIC_LDADD+=	$(top_builddir)/external/libelf_static.la

else

GENERIC_LDADD+=	-lelf

endif
@@ -22,6 +23,7 @@ endif
PUBLIC_INCS=	-I$(top_srcdir)/libpkg -DTESTING \

		-I/usr/local/include

PRIVATE_INCS=	$(PUBLIC_INCS) \
+ 
		-I$(top_srcdir)/external/libsbuf \

		-I$(top_srcdir)/external/sqlite \

		-I$(top_srcdir)/external/uthash \

		-I$(top_srcdir)/external/libucl/include
@@ -34,7 +36,8 @@ pkg_printf_CFLAGS= $(PRIVATE_INCS)
pkg_printf_LDADD=	$(GENERIC_LDADD)



pkg_validation_SOURCES=	lib/pkg_validation.c
- 
pkg_validation_CFLAGS=	$(PUBLIC_INCS)
+ 
pkg_validation_CFLAGS=	$(PUBLIC_INCS) \
+ 
			-I$(top_srcdir)/external/libsbuf

pkg_validation_LDADD=	$(GENERIC_LDADD)



plist_SOURCES=		lib/plist.c
modified tests/lib/pkg_validation.c
@@ -24,6 +24,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
+ 
#include <sys/sbuf.h>
+ 


#include <string.h>



#include <atf-c.h>