Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.6.3 2015-11-05T20:18:09Z 2015-11-05T20:18:09Z Junio C Hamano gitster@pobox.com 2015-11-05T20:18:08Z urn:sha1:3897d2d906df0edebd78b8d9604d02cd120bac36 The linkage order of libraries was wrong in places around libcurl. * rp/link-curl-before-ssl: configure.ac: detect ssl need with libcurl Makefile: make curl-config path configurable Makefile: link libcurl before zlib 2015-10-21T19:43:31Z Remi Pommarel repk@triplefau.lt 2015-10-21T17:10:46Z urn:sha1:f89158760d5f02ba59f644799abd921e6be22f13 There are situations, e.g. during cross compilation, where curl-config program is not present in the PATH. Make the makefile use a configurable curl-config program passed through CURL_CONFIG variable which can be set through config.mak. Also make this variable tunable through use of autoconf/configure. Configure will set CURL_CONFIG variable in config.mak.autogen to whatever value has been passed to ac_cv_prog_CURL_CONFIG. Signed-off-by: Remi Pommarel <repk@triplefau.lt> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-10-21T19:43:03Z Remi Pommarel repk@triplefau.lt 2015-10-21T17:01:13Z urn:sha1:9eaa78b0b037964da85d6a15f0128639f2118a53 For static linking especially library order while linking is important. For example, libcurl wants symbols from zlib when building http-push, http-fetch and remote-curl. So for these programs libcurl has to be linked before zlib. Signed-off-by: Remi Pommarel <repk@triplefau.lt> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-10-16T21:32:38Z Junio C Hamano gitster@pobox.com 2015-10-16T21:32:38Z urn:sha1:47c566a4d670e892ffa42fe307c45f41fc5a6ac5 Customization to change the behaviour with "make -w" and "make -s" in our Makefile was broken when they were used together. * jk/make-findstring-makeflags-fix: Makefile: fix MAKEFLAGS tests with multiple flags 2015-10-16T21:32:36Z Junio C Hamano gitster@pobox.com 2015-10-16T21:32:36Z urn:sha1:4d2a3011eed6abda1399de2774bd8f08db1581f9 The Makefile always runs the library archiver with hardcoded "crs" options, which was inconvenient for exotic platforms on which people want to use programs with totally different set of command line options. * jw/make-arflags-customizable: Makefile: allow $(ARFLAGS) specified from the command line 2015-09-14T21:59:05Z Junio C Hamano gitster@pobox.com 2015-09-14T21:59:05Z urn:sha1:a9400b01dfc2256ae6e2c3bd3671519188a3a467 * sg/help-group: Makefile: use SHELL_PATH when running generate-cmdlist.sh 2015-09-11T00:49:00Z Alejandro R. Sedeño asedeno@mit.edu 2015-09-10T23:37:07Z urn:sha1:57cee8ac5f108f1e4a51372b37c82a72b0407042 Non-POSIX shells, such as /bin/sh on SunOS, do not support $((...)) arithmetic expansion or $(...) command substitution needed by generate-cmdlist.sh. Make sure that we use a POSIX compliant shell $(SHELL_PATH) when running generate-cmdlist.sh. Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Acked-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-09-10T21:27:21Z Junio C Hamano gitster@pobox.com 2015-09-10T21:27:21Z urn:sha1:ac179b4d9ceb460ca0b6bc77806b54b8e7dc3dd4 We can do this because we have a very simple needs and run "ar" exactly the same way everywhere ;-). Requested-by: Jeffrey Walton Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-09-10T16:26:23Z John Keeping john@keeping.me.uk 2015-09-05T12:22:10Z urn:sha1:ef49e05a6431727b54c399d1f3636c76ac682d61 findstring is defined as $(findstring FIND,IN) so if multiple flags are set these tests do the wrong thing unless $(MAKEFLAGS) is the second argument. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-09-04T02:17:51Z Junio C Hamano gitster@pobox.com 2015-09-04T02:17:51Z urn:sha1:969560bddc07fe5c11470be6d2dfcc62215c8692 We rewrote one of the build scripts in Perl but this reimplements in Bourne shell. * sg/help-group: generate-cmdlist: re-implement as shell script