From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:53 +0000 (+0900)
Subject: Merge branch 'js/mingw-res-rebuild'
X-Git-Tag: v2.20.0-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39847644adb3678da91048b2ac6ebc2b3c475f3a?ds=inline;hp=-c

Merge branch 'js/mingw-res-rebuild'

Windows build update.

* js/mingw-res-rebuild:
Windows: force-recompile git.res for differing architectures
---

39847644adb3678da91048b2ac6ebc2b3c475f3a
diff --combined Makefile
index 7c4974348b,8375736c32..827e963378
--- a/Makefile
+++ b/Makefile
@@@ -59,13 -59,6 +59,13 @@@ all:
  # Define CURL_CONFIG to curl's configuration program that prints information
  # about the library (e.g., its version number).  The default is 'curl-config'.
  #
 +# Define CURL_LDFLAGS to specify flags that you need to link when using libcurl,
 +# if you do not want to rely on the libraries provided by CURL_CONFIG.  The
 +# default value is a result of `curl-config --libs`.  An example value for
 +# CURL_LDFLAGS is as follows:
 +#
 +#     CURL_LDFLAGS=-lcurl
 +#
  # Define NO_EXPAT if you do not have expat installed.  git-http-push is
  # not built, and you cannot push using http:// and https:// transports (dumb).
  #
@@@ -190,6 -183,10 +190,6 @@@
  #
  # Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
  #
 -# Define NEEDS_SSL_WITH_CURL if you need -lssl with -lcurl (Minix).
 -#
 -# Define NEEDS_IDN_WITH_CURL if you need -lidn when using -lcurl (Minix).
 -#
  # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
  #
  # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
@@@ -754,7 -751,6 +754,7 @@@ TEST_BUILTINS_OBJS += test-sigchain.
  TEST_BUILTINS_OBJS += test-strcmp-offset.o
  TEST_BUILTINS_OBJS += test-string-list.o
  TEST_BUILTINS_OBJS += test-submodule-config.o
 +TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o
  TEST_BUILTINS_OBJS += test-subprocess.o
  TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
  TEST_BUILTINS_OBJS += test-wildmatch.o
@@@ -996,7 -992,6 +996,7 @@@ LIB_OBJS += sub-process.
  LIB_OBJS += symlinks.o
  LIB_OBJS += tag.o
  LIB_OBJS += tempfile.o
 +LIB_OBJS += thread-utils.o
  LIB_OBJS += tmp-objdir.o
  LIB_OBJS += trace.o
  LIB_OBJS += trailer.o
@@@ -1312,17 -1307,20 +1312,17 @@@ els
  	ifdef CURLDIR
  		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
  		BASIC_CFLAGS += -I$(CURLDIR)/include
 -		CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
 +		CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib)
  	else
 -		CURL_LIBCURL = -lcurl
 -	endif
 -	ifdef NEEDS_SSL_WITH_CURL
 -		CURL_LIBCURL += -lssl
 -		ifdef NEEDS_CRYPTO_WITH_SSL
 -			CURL_LIBCURL += -lcrypto
 -		endif
 -	endif
 -	ifdef NEEDS_IDN_WITH_CURL
 -		CURL_LIBCURL += -lidn
 +		CURL_LIBCURL =
  	endif
  
 +ifdef CURL_LDFLAGS
 +	CURL_LIBCURL += $(CURL_LDFLAGS)
 +else
 +	CURL_LIBCURL += $(shell $(CURL_CONFIG) --libs)
 +endif
 +
  	REMOTE_CURL_PRIMARY = git-remote-http$X
  	REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
  	REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
@@@ -1678,6 -1676,7 +1678,6 @@@ ifdef NO_PTHREAD
  else
  	BASIC_CFLAGS += $(PTHREAD_CFLAGS)
  	EXTLIBS += $(PTHREAD_LIBS)
 -	LIB_OBJS += thread-utils.o
  endif
  
  ifdef HAVE_PATHS_H
@@@ -2071,7 -2070,7 +2071,7 @@@ $(BUILT_INS): git$
  
  command-list.h: generate-cmdlist.sh command-list.txt
  
 -command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
 +command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
  	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
  
  SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
@@@ -2111,7 -2110,7 +2111,7 @@@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEF
  	$(QUIET_GEN)$(cmd_munge_script) && \
  	mv $@+ $@
  
- git.res: git.rc GIT-VERSION-FILE
+ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
  	$(QUIET_RC)$(RC) \
  	  $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
  	    $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \