diff options
| author | Michael Forney <mforney@mforney.org> | 2017-05-27 21:53:33 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-05-28 16:32:49 -0700 |
| commit | 6509f3863a148f228ce6c08e14bd0a6a0ca86327 (patch) | |
| tree | a1747a3ffbc0ac557057886b096d06229b59ce73 | |
| parent | 3d04093e74f1d948d359106fef7c72f908196b5a (diff) | |
git: Use curl for git-imap-send
We already use it for git-remote-http, and this removes the dependency
on libssl.
| -rw-r--r-- | pkg/git/config.h | 4 | ||||
| -rw-r--r-- | pkg/git/gen.rc | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkg/git/config.h b/pkg/git/config.h index 47675e39..9caad58d 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -10,6 +10,8 @@ #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION #define GIT_VERSION "2.13.0" -#define NO_SYS_POLL_H #define PAGER_ENV "LESS=FRX LV=-c" +#define NO_SYS_POLL_H +#define NO_OPENSSL +#define USE_CURL_FOR_IMAP_SEND #define SHA1_DC diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc index feefdd1b..f5a62f6b 100644 --- a/pkg/git/gen.rc +++ b/pkg/git/gen.rc @@ -1,7 +1,6 @@ cflags\ -include '$dir'/config.h\ -isystem '$builddir'/pkg/curl/include\ - -isystem '$builddir'/pkg/libressl/include\ -isystem '$builddir'/pkg/zlib/include\ -I '$srcdir' \ -I '$srcdir'/compat/regex\ @@ -10,10 +9,11 @@ cflags\ rule cmdlist 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out' build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/Documentation/`{grep -v '^#' commands.txt} -phony deps '$outdir'/common-cmds.h pkg/^(curl libressl zlib)^/headers +phony deps '$outdir'/common-cmds.h pkg/^(curl zlib)^/headers cc exec_cmd.c '||' '$dir'/deps ; with cflags '$cflags ''-DPREFIX=""''' cc common-main.c '||' '$dir'/deps +cc http.c '||' '$dir'/deps cc compat/regex/regex.c '||' '$dir'/deps ; with cflags '$cflags -DGAWK -DNO_MBSUPPORT' # src/Makefile:/^LIB_OBJS.\+= @@ -188,6 +188,7 @@ lib libgit.a -d '$dir'/deps\ \ sha1dc/sha1.c\ sha1dc/ubc_check.c\ + \ thread-utils.c\ libxdiff.a\ '$builddir'/pkg/zlib/libz.a @@ -327,14 +328,14 @@ x credential-store x daemon x fast-import x http-backend -x imap-send imap-send.c '$builddir'/pkg/libressl/libssl.a.d +x imap-send imap-send.c http.c.o '$builddir'/pkg/curl/libcurl.a.d x sh-i18n--envsubst x shell x show-index x upload-pack # git-remote-testsvn is intentionally omitted. -x remote-http remote-curl.c http.c http-walker.c '$builddir'/pkg/curl/libcurl.a.d +x remote-http remote-curl.c http.c.o http-walker.c '$builddir'/pkg/curl/libcurl.a.d for(remote in https ftp ftps) sym libexec/git-core/git-remote-$remote git-remote-http rule sh_gen 'sed -f $dir/sh_gen.sed $in >$out.tmp && mv $out.tmp $out' |