user/sven/git.git/Makefile, branch v1.7.9.3

Sync with 1.7.8.5

2012-02-27T00:42:35Z

Makefile: add thread-utils.h to LIB_H

2012-02-26T22:31:26Z

Starting with commit v1.7.8-165-g0579f91, grep.h includes thread-utils.h, so the latter has to be added to LIB_H. Signed-off-by: Dmitry V. Levin Acked-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'dp/i18n-libcharset' into maint

2012-02-21T22:57:14Z

* dp/i18n-libcharset: Makefile: introduce CHARSET_LIB to link with -lcharset

Merge branch 'tt/profile-build-fix' into maint

2012-02-21T22:56:06Z

* tt/profile-build-fix: Makefile: fix syntax for older make Fix build problems related to profile-directed optimization

Merge branch 'mp/make-cleanse-x-for-exe' into maint

2012-02-14T07:26:25Z

* mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage

Makefile: Change the default compiler from "gcc" to "cc"

2012-02-13T10:28:54Z

Ever since the very first commit to git.git we've been setting CC to "gcc". Presumably this is behavior that Linus copied from the Linux Makefile. However unlike Linux Git is written in ANSI C and supports a multitude of compilers, including Clang, Sun Studio, xlc etc. On my Linux box "cc" is a symlink to clang, and on a Solaris box I have access to "cc" is Sun Studio's CC. Both of these are perfectly capable of compiling Git, and it's annoying to have to specify CC=cc on the command-line when compiling Git when that's the default behavior of most other portable programs. So change the default to "cc". Users who want to compile with GCC can still add "CC=gcc" to the make(1) command-line, but those users who don't have GCC as their "cc" will see expected behavior, and as a bonus we'll be more likely to smoke out new compilation warnings from our distributors since they'll me using a more varied set of compilers by default. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Makefile: introduce CHARSET_LIB to link with -lcharset

2012-02-13T08:11:01Z

On some systems, the function locale_charset() may not be exported from libiconv but is available from libcharset, and we need -lcharset when linking. Introduce a make variable CHARSET_LIB that can be set to -lcharsetlib on such systems. Also autodetect this in the configure script by first looking for the symbol in libiconv, and then libcharset. Signed-off-by: Дилян Палаузов

Explicitly set X to avoid potential build breakage

2012-02-09T22:31:48Z

$X is appended to binary names for Windows builds (ie. git.exe). Pollution from the environment can inadvertently trigger this behaviour, resulting in 'git' turning into 'gitwhatever' without warning. Signed-off-by: Michael Palimaka Signed-off-by: Junio C Hamano

Makefile: fix syntax for older make

2012-02-09T19:47:54Z

It is necessary to write the else branch as a nested conditional. Also, write the conditions with parentheses because we use them throughout the Makefile. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Fix build problems related to profile-directed optimization

2012-02-06T08:15:12Z

There was a number of problems I ran into when trying the profile-directed optimizations added by Andi Kleen in git commit 7ddc2710b9. (This was using gcc 4.4 found on many enterprise distros.) 1) The -fprofile-generate and -fprofile-use commands are incompatible with ccache; the code ends up looking in the wrong place for the gcda files based on the ccache object names. 2) If the makefile notices that CFLAGS are different, it will rebuild all of the binaries. Hence the recipe originally specified by the INSTALL file ("make profile-all" followed by "make install") doesn't work. It will appear to work, but the binaries will end up getting built with no optimization. This patch fixes this by using an explicit set of options passed via the PROFILE variable then using this to directly manipulate CFLAGS and EXTLIBS. The developer can run "make PROFILE=BUILD all ; sudo make PROFILE=BUILD install" automatically run a two-pass build with the test suite run in between as the sample workload for the purpose of recording profiling information to do the profile-directed optimization. Alternatively, the profiling version of binaries can be built using: make PROFILE=GEN PROFILE_DIR=/var/cache/profile all make PROFILE=GEN install and then after git has been used for a while, the optimized version of the binary can be built as follows: make PROFILE=USE PROFILE_DIR=/var/cache/profile all make PROFILE=USE install Signed-off-by: "Theodore Ts'o" Cc: Andi Kleen Signed-off-by: Junio C Hamano