Index: sysutils/fusefs-lkl/Makefile =================================================================== --- sysutils/fusefs-lkl/Makefile +++ sysutils/fusefs-lkl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lkl -PORTVERSION= 4.3.0 +PORTVERSION= 4.5.0 CATEGORIES= sysutils MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= fusefs- @@ -20,7 +20,7 @@ USE_GCC= yes USE_GITHUB= yes GH_PROJECT= linux -GH_TAGNAME= 64a367f522c6ec4fbed0193589d7733b06ab7968 +GH_TAGNAME= f20b70598f5c9d8cab798dae7c4cb0d118f5a14a ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet @@ -30,18 +30,18 @@ MAKE_JOBS_UNSAFE=yes MAKE_ARGS+= V=1 # Need ports versions of 'bc', 'ld' to build! -MAKE_ARGS+= PATH="${PREFIX}/bin:${PATH}" +MAKE_ARGS+= PATH="${LOCALBASE}/bin:${PATH}" PLIST_FILES= bin/lklfuse lib/liblkl.a do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lklfuse ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/lib/liblkl.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/liblkl.a ${STAGEDIR}${PREFIX}/lib .include .if ${OSVERSION} < 1100000 -IGNORE= requires FreeBSD CURRENT +IGNORE= requires FreeBSD 11 or newer .endif .include Index: sysutils/fusefs-lkl/distinfo =================================================================== --- sysutils/fusefs-lkl/distinfo +++ sysutils/fusefs-lkl/distinfo @@ -1,2 +1,3 @@ -SHA256 (lkl-linux-4.3.0-64a367f522c6ec4fbed0193589d7733b06ab7968_GH0.tar.gz) = a0d45aadd13df116ea7496c8107395ae504972bb7c8436bb099b9fd43817b8f5 -SIZE (lkl-linux-4.3.0-64a367f522c6ec4fbed0193589d7733b06ab7968_GH0.tar.gz) = 133474279 +TIMESTAMP = 1471321699 +SHA256 (lkl-linux-4.5.0-f20b70598f5c9d8cab798dae7c4cb0d118f5a14a_GH0.tar.gz) = 361b4f9db06f6bd2787db5c750ad51b0e4ca42f6853a0b46448c05dbbaa0481d +SIZE (lkl-linux-4.5.0-f20b70598f5c9d8cab798dae7c4cb0d118f5a14a_GH0.tar.gz) = 139397907 Index: sysutils/fusefs-lkl/files/patch-Makefile =================================================================== --- sysutils/fusefs-lkl/files/patch-Makefile +++ sysutils/fusefs-lkl/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile 2015-11-17 14:22:24.000000000 -0800 -+++ Makefile 2015-11-17 17:23:27.478293000 -0800 -@@ -40,8 +40,8 @@ - $(AR) -rc $@ $^ +--- Makefile.orig 2016-08-16 04:39:25 UTC ++++ Makefile +@@ -121,8 +121,8 @@ endif + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*) lib/lkl.o: -- $(MAKE) -C ../.. ARCH=lkl defconfig -- $(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(PWD) -+ $(MAKE) -C ../.. ARCH=lkl LDFLAGS= defconfig -+ $(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(PWD) +- $(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) defconfig +- $(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(CURDIR) ++ $(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) defconfig ++ $(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(CURDIR) - %: %.o - $(CC) -o $@ $^ $(LDFLAGS) + liblkl.a: lib/lkl-in.o lib/lkl.o + $(QUIET_AR)$(AR) -rc $@ $^ Index: sysutils/fusefs-lkl/files/patch-lib_Build =================================================================== --- /dev/null +++ sysutils/fusefs-lkl/files/patch-lib_Build @@ -0,0 +1,12 @@ +--- lib/Build.orig 2016-08-16 03:09:03 UTC ++++ lib/Build +@@ -12,9 +12,5 @@ lkl-y += virtio.o + lkl-y += dbg.o + lkl-y += dbg_handler.o + lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net.o +-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_linux_fdnet.o +-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_tap.o +-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_raw.o +-lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_macvtap.o + lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_DPDK) += virtio_net_dpdk.o + lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_VDE) += virtio_net_vde.o Index: sysutils/fusefs-lkl/files/patch-lib_posix-host.c =================================================================== --- /dev/null +++ sysutils/fusefs-lkl/files/patch-lib_posix-host.c @@ -0,0 +1,23 @@ +--- lib/posix-host.c.orig 2016-08-16 03:09:03 UTC ++++ lib/posix-host.c +@@ -195,7 +195,7 @@ static void thread_exit(void) + + static int thread_join(lkl_thread_t tid) + { +- if (WARN_PTHREAD(pthread_join(tid, NULL))) ++ if (WARN_PTHREAD(pthread_join((pthread_t)tid, NULL))) + return -1; + else + return 0; +@@ -276,7 +276,11 @@ static void panic(void) + + static long _gettid(void) + { ++#ifdef __FreeBSD__ ++ return (long)pthread_self(); ++#else + return syscall(SYS_gettid); ++#endif + } + + struct lkl_host_operations lkl_host_ops = { Index: sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile =================================================================== --- sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile +++ sysutils/fusefs-lkl/files/patch-tools-lkl-Makefile @@ -1,13 +0,0 @@ ---- Makefile 2015-11-17 14:22:24.000000000 -0800 -+++ Makefile 2015-11-17 17:23:27.478293000 -0800 -@@ -40,8 +40,8 @@ - $(AR) -rc $@ $^ - - lib/lkl.o: -- $(MAKE) -C ../.. ARCH=lkl defconfig -- $(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(PWD) -+ $(MAKE) -C ../.. ARCH=lkl LDFLAGS= defconfig -+ $(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(PWD) - - %: %.o - $(CC) -o $@ $^ $(LDFLAGS)