From dfaab0efa8c7cea218667f10fcce3ad15a5b35c3 Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Fri, 8 Dec 2023 11:13:16 -0500 Subject: [PATCH] fix build --- contrib/mport/mport/mport.c | 2 +- lib/libmport/Makefile | 2 +- usr.sbin/mport/Makefile | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/mport/mport/mport.c b/contrib/mport/mport/mport.c index c733a10a76..2cf36c8b8b 100644 --- a/contrib/mport/mport/mport.c +++ b/contrib/mport/mport/mport.c @@ -755,7 +755,7 @@ install(mportInstance *mport, const char *packageName) mportIndexEntry **indexEntry = NULL; mportIndexEntry **ie = NULL; mportIndexEntry **i2 = NULL; - int resultCode; + int resultCode = MPORT_OK; int item; int choice; diff --git a/lib/libmport/Makefile b/lib/libmport/Makefile index 4d0f7b037f..890d813a3c 100644 --- a/lib/libmport/Makefile +++ b/lib/libmport/Makefile @@ -13,7 +13,7 @@ SRCS= asset.c bundle_write.c bundle_read.c plist.c create_primative.c db.c \ update_primative.c bundle_read_update_pkg.c pkgmeta.c \ fetch.c index.c index_depends.c install.c clean.c setting.c \ stats.c verify.c lock.c mkdir.c \ - import_export.c upgrade.c update.c autoremove.c ping.c + import_export.c upgrade.c update.c autoremove.c ping.c message.c INCS= mport.h CFLAGS+= -I${.CURDIR} -I${MPORTDIR}/libmport diff --git a/usr.sbin/mport/Makefile b/usr.sbin/mport/Makefile index b4703994b4..f81e8bc7ed 100644 --- a/usr.sbin/mport/Makefile +++ b/usr.sbin/mport/Makefile @@ -5,6 +5,9 @@ MPORTDIR= ${SRCTOP}/contrib/mport CFLAGS= -I${MPORTDIR}/libmport/ -LIBADD+= mport util +CFLAGS+=-I${SRCTOP}/contrib/libucl/include +.PATH: ${SRCTOP}/contrib/libucl/include + +LIBADD+= mport ucl util .include