Re: Makefile checks for DarwinPorts / Fink
- From
Shawn Pearce <spearce@spearce.org>
- Date
- Jul 24, 2006, 04:28 UTC
- Message-ID
- <20060724042828.GB9066@spearce.org>
- In-Reply-To
- <e9vrsf$foc$1@sea.gmane.org>
Jakub Narebski <jnareb@gmail.com> wrote:
> Could you _please_ document this option in commentary part in main > Makefile?
OK.
I left them out originally as it seemed like other platform specific items weren't in the main commentary part, but since these are new defines I guess it makes perfect sense that they should be documented before they get included into the main Makefile. :-)
Hopefully this is the final version of this patch...
-->8-- Disable linking with Fink or DarwinPorts.
It may be desirable for the compiler to disable linking against Fink or DarwinPorts, especially if both are installed on the system and the user wants GIT to be linked specifically to only one of them.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- Makefile | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile index a1666e2..5432636 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,18 @@ # Define NO_SVN_TESTS if you want to ski # tests. These tests take up a significant amount of the total test time # but are not needed unless you plan to talk to SVN repos. # +# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink +# installed in /sw, but don't want GIT to link against any libraries +# installed there. If defined you may specify your own (or Fink's) +# include directories and library directories by defining CFLAGS +# and LDFLAGS appropriately. +# +# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X, +# have DarwinPorts installed in /opt/local, but don't want GIT to +# link against any libraries installed there. If defined you may +# specify your own (or DarwinPort's) include directories and +# library directories by defining CFLAGS and LDFLAGS appropriately. +# # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # @@ -267,15 +279,17 @@ ifeq ($(uname_S),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease NO_STRLCPY = YesPlease - ## fink - ifeq ($(shell test -d /sw/lib && echo y),y) - BASIC_CFLAGS += -I/sw/include - BASIC_LDFLAGS += -L/sw/lib + ifndef NO_FINK + ifeq ($(shell test -d /sw/lib && echo y),y) + BASIC_CFLAGS += -I/sw/include + BASIC_LDFLAGS += -L/sw/lib + endif endif - ## darwinports - ifeq ($(shell test -d /opt/local/lib && echo y),y) - BASIC_CFLAGS += -I/opt/local/include - BASIC_LDFLAGS += -L/opt/local/lib + ifndef NO_DARWIN_PORTS + ifeq ($(shell test -d /opt/local/lib && echo y),y) + BASIC_CFLAGS += -I/opt/local/include + BASIC_LDFLAGS += -L/opt/local/lib + endif endif endif ifeq ($(uname_S),SunOS)
-- 1.4.2.rc1.ge711