commit 973f3f6e968a6729bf43c2421b75db48ff4626b4 from: Thomas Adam date: Mon Mar 07 22:52:51 2022 UTC portable: enable got-read-patch Allow the libexec helper, `got-read-patch` to be compiled, portably. commit - 069bbb862c310dff25056a8d02a59bded471478d commit + 973f3f6e968a6729bf43c2421b75db48ff4626b4 blob - e33d930c6504cc00c0b9759a91f892c77b139416 blob + 3fe9d8e3e3a4d064ff9bad57994e1f33f18b0bde --- configure.ac +++ configure.ac @@ -486,6 +486,7 @@ AC_CONFIG_FILES([Makefile libexec/got-read-gotconfig/Makefile libexec/got-read-object/Makefile libexec/got-read-pack/Makefile + libexec/got-read-patch/Makefile libexec/got-read-tag/Makefile libexec/got-send-pack/Makefile got/Makefile blob - fbf540c9c2c192ce98b28b826c4ebc72f0ccedcd blob + bc980d1de458ba2d7265ed5e5f09828ba2c2f9b2 --- got/Makefile.am +++ got/Makefile.am @@ -15,6 +15,7 @@ got_SOURCES = got.c \ $(top_srcdir)/lib/object_idset.c \ $(top_srcdir)/lib/object_parse.c \ $(top_srcdir)/lib/opentemp.c \ + $(top_srcdir)/lib/patch.c \ $(top_srcdir)/lib/path.c \ $(top_srcdir)/lib/pack.c \ $(top_srcdir)/lib/privsep.c \ blob - 84226a57dca7da7a69187a76d804e8ceda7558ba blob + af4423820093c59ffc872ceda9571a41e456f853 --- lib/patch.c +++ lib/patch.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include blob - f4ec33f6db6cadd71ad94f00067826723685e4ec blob + 3576551fba26e3f3f4903526dc43d69f90c88f9d --- libexec/Makefile.am +++ libexec/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = got-fetch-pack \ got-read-gotconfig \ got-read-object \ got-read-pack \ + got-read-patch \ got-read-tag \ got-read-tree \ got-send-pack blob - 9eddbae60cbd3e82dc3178ffebc9903391caa40c (mode 644) blob + /dev/null --- libexec/got-read-patch/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -.PATH:${.CURDIR}/../../lib - -.include "../../got-version.mk" - -PROG= got-read-patch -SRCS= got-read-patch.c error.c inflate.c object_parse.c \ - path.c privsep.c sha1.c - -CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib -LDADD = -lz -lutil -DPADD = ${LIBZ} ${LIBUTIL} - -.include blob - /dev/null blob + f6fdb7c5329475c7beee119cfaa7e8162dc252a4 (mode 644) --- /dev/null +++ libexec/got-read-patch/Makefile.am @@ -0,0 +1,18 @@ +libexec_PROGRAMS = got-read-patch + +include $(top_builddir)/Makefile.common + +got_read_patch_SOURCES = got-read-patch.c \ + $(top_srcdir)/lib/error.c \ + $(top_srcdir)/lib/inflate.c \ + $(top_srcdir)/lib/object_parse.c \ + $(top_srcdir)/lib/path.c \ + $(top_srcdir)/lib/privsep.c \ + $(top_srcdir)/lib/sha1.c + +got_read_patch_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a + +LDADD = -L$(top_builddir)/compat -lopenbsd-compat +if HOST_FREEBSD +LDADD += -lmd +endif blob - ed5eb50b17c3c73f369b043bdf1ea72f54f5ff88 blob + dc6c5b47ca22fd7c72e5f927a8779a2b71e8e2f7 --- libexec/got-read-patch/got-read-patch.c +++ libexec/got-read-patch/got-read-patch.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -53,6 +52,8 @@ #include "got_error.h" #include "got_object.h" +#include "got_compat.h" + #include "got_lib_delta.h" #include "got_lib_object.h" #include "got_lib_privsep.h"