{"thread":{"id":"5491","subject":"[PATCH] Include local config before platform tweaks","startedAt":"2006-09-05T22:00:46Z","lastAt":"2006-09-06T19:13:16Z","messageCount":5,"participants":["Brian Gernhardt","Junio C Hamano","Shawn Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"26377","messageId":"9434EEBD-57BE-46D7-A2FF-069BB960AA44@silverinsanity.com","threadId":"5491","inReplyTo":null,"subject":"[PATCH] Include local config before platform tweaks","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2006-09-05T22:00:46Z","receivedAt":"2006-09-05T22:00:46Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"Having config.mak included after the platform tweaks ignores NO_FINK \nor NO_DARWIN_PORTS in that file. Simply including the config earlier \nfixes that.\n\nSigned-off-by: Brian Gernhardt \n---\nMakefile | 6 +++---\n1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 7b3114f..81902d4 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -300,6 +300,9 @@ BUILTIN_OBJS = \\\nGITLIBS = $(LIB_FILE) $(XDIFF_LIB)\nLIBS = $(GITLIBS) -lz\n+-include config.mak.autogen\n+-include config.mak\n+\n#\n# Platform specific tweaks\n#\n@@ -403,9 +406,6 @@ ifneq (,$(findstring arm,$(uname_M)))\n\tARM_SHA1 = YesPlease\nendif\n--include config.mak.autogen\n--include config.mak\n-\nifdef WITH_OWN_SUBPROCESS_PY\n\tPYMODULES += compat/subprocess.py\nelse\n"},{"id":"26380","messageId":"7vlkoyarnx.fsf@assigned-by-dhcp.cox.net","threadId":"5491","inReplyTo":"9434EEBD-57BE-46D7-A2FF-069BB960AA44@silverinsanity.com","subject":"Re: [PATCH] Include local config before platform tweaks","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-09-05T22:13:06Z","receivedAt":"2006-09-05T22:13:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brian Gernhardt writes:\n\n> Having config.mak included after the platform tweaks ignores NO_FINK\n> or NO_DARWIN_PORTS in that file. Simply including the config earlier\n> fixes that.\n\nI vaguely recall that this was brought up before, and the\nconclusion was that the include location is correct but the way\ndarwin bits were done was wrong. I do not recall the details\nbut does anybody on the list know?\n"},{"id":"26387","messageId":"20060906033151.GB30540@spearce.org","threadId":"5491","inReplyTo":"7vlkoyarnx.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Include local config before platform tweaks","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-09-06T03:31:51Z","receivedAt":"2006-09-06T03:31:51Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> Brian Gernhardt writes:\n> \n> > Having config.mak included after the platform tweaks ignores NO_FINK\n> > or NO_DARWIN_PORTS in that file. Simply including the config earlier\n> > fixes that.\n> \n> I vaguely recall that this was brought up before, and the\n> conclusion was that the include location is correct but the way\n> darwin bits were done was wrong. I do not recall the details\n> but does anybody on the list know?\n\nI think we just need to move the NO_FINK stuff below the include;\nlike this:\n\n\ndiff --git a/Makefile b/Makefile\nindex 164dbcf..748907b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -328,18 +333,6 @@ ifeq ($(uname_S),Darwin)\n \tNEEDS_SSL_WITH_CRYPTO = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n \tNO_STRLCPY = YesPlease\n-\tifndef NO_FINK\n-\t\tifeq ($(shell test -d /sw/lib && echo y),y)\n-\t\t\tBASIC_CFLAGS += -I/sw/include\n-\t\t\tBASIC_LDFLAGS += -L/sw/lib\n-\t\tendif\n-\tendif\n-\tifndef NO_DARWIN_PORTS\n-\t\tifeq ($(shell test -d /opt/local/lib && echo y),y)\n-\t\t\tBASIC_CFLAGS += -I/opt/local/include\n-\t\t\tBASIC_LDFLAGS += -L/opt/local/lib\n-\t\tendif\n-\tendif\n endif\n ifeq ($(uname_S),SunOS)\n \tNEEDS_SOCKET = YesPlease\n@@ -433,6 +426,21 @@ else\n \tendif\n endif\n \n+ifeq ($(uname_S),Darwin)\n+\tifndef NO_FINK\n+\t\tifeq ($(shell test -d /sw/lib && echo y),y)\n+\t\t\tBASIC_CFLAGS += -I/sw/include\n+\t\t\tBASIC_LDFLAGS += -L/sw/lib\n+\t\tendif\n+\tendif\n+\tifndef NO_DARWIN_PORTS\n+\t\tifeq ($(shell test -d /opt/local/lib && echo y),y)\n+\t\t\tBASIC_CFLAGS += -I/opt/local/include\n+\t\t\tBASIC_LDFLAGS += -L/opt/local/lib\n+\t\tendif\n+\tendif\n+endif\n+\n ifndef NO_CURL\n \tifdef CURLDIR\n \t\t# This is still problematic -- gcc does not always want -R.\n"},{"id":"26390","messageId":"7vwt8h8nuf.fsf@assigned-by-dhcp.cox.net","threadId":"5491","inReplyTo":"20060906033151.GB30540@spearce.org","subject":"Re: [PATCH] Include local config before platform tweaks","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-09-06T07:18:32Z","receivedAt":"2006-09-06T07:18:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Shawn Pearce writes:\n\n> Junio C Hamano wrote:\n>> Brian Gernhardt writes:\n>> \n>> > Having config.mak included after the platform tweaks ignores NO_FINK\n>> > or NO_DARWIN_PORTS in that file. Simply including the config earlier\n>> > fixes that.\n>> \n>> I vaguely recall that this was brought up before, and the\n>> conclusion was that the include location is correct but the way\n>> darwin bits were done was wrong. I do not recall the details\n>> but does anybody on the list know?\n>\n> I think we just need to move the NO_FINK stuff below the include;\n> like this:\n\nThanks Shawn. Brian does Shawn's patch work for you?\n"},{"id":"26437","messageId":"5EDA627C-CBE3-4408-A4F5-D668BB2478BC@silverinsanity.com","threadId":"5491","inReplyTo":"7vwt8h8nuf.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Include local config before platform tweaks","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2006-09-06T19:13:16Z","receivedAt":"2006-09-06T19:13:16Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"On Sep 6, 2006, at 3:18 AM, Junio C Hamano wrote:\n\n> Thanks Shawn. Brian does Shawn's patch work for you?\n\nShort answer: Yes\n\nLong answer:\nThe patch from his e-mail failed (git apply: fatal: corrupt patch at \nline 27), but manually making the changes worked. I didn't pull \nbefore applying that, so that's probably the problem there.\n\n~~Brian\n"}]}