{"thread":{"id":"22289","subject":"[PATCH] Makefile: honor NO_CURL when setting REMOTE_CURL_* variables","startedAt":"2010-01-19T15:39:12Z","lastAt":"2010-01-19T23:31:52Z","messageCount":3,"participants":["Johannes Sixt","Ilari Liusvaara","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132110","messageId":"1263915552-32537-1-git-send-email-j6t@kdbg.org","threadId":"22289","inReplyTo":null,"subject":"[PATCH] Makefile: honor NO_CURL when setting REMOTE_CURL_* variables","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2010-01-19T15:39:12Z","receivedAt":"2010-01-19T15:39:12Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Previously, these variables were set before there was a chance to set\nNO_CURL.\n\nThis made a difference only during 'make install', because by installing\n$(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY),\nwhich was never installed. On Windows, this fails; on Unix, stale symbolic\nlinks are created.\n\nSigned-off-by: Johannes Sixt \n---\n Makefile | 16 ++++++----------\n 1 files changed, 6 insertions(+), 10 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 8ed07cf..43fd686 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -423,18 +423,8 @@ BUILT_INS += git-show$X\n BUILT_INS += git-stage$X\n BUILT_INS += git-status$X\n BUILT_INS += git-whatchanged$X\n \n-ifdef NO_CURL\n-REMOTE_CURL_PRIMARY =\n-REMOTE_CURL_ALIASES =\n-REMOTE_CURL_NAMES =\n-else\n-REMOTE_CURL_PRIMARY = git-remote-http$X\n-REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X\n-REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)\n-endif\n-\n # what 'all' will build and 'install' will install in gitexecdir,\n # excluding programs for built-in commands\n ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)\n \n@@ -1108,16 +1098,22 @@ ifdef NO_LIBGEN_H\n endif\n \n ifdef NO_CURL\n \tBASIC_CFLAGS += -DNO_CURL\n+\tREMOTE_CURL_PRIMARY =\n+\tREMOTE_CURL_ALIASES =\n+\tREMOTE_CURL_NAMES =\n else\n \tifdef CURLDIR\n \t\t# Try \"-Wl,-rpath=$(CURLDIR)/$(lib)\" in such a case.\n \t\tBASIC_CFLAGS += -I$(CURLDIR)/include\n \t\tCURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl\n \telse\n \t\tCURL_LIBCURL = -lcurl\n \tendif\n+\tREMOTE_CURL_PRIMARY = git-remote-http$X\n+\tREMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X\n+\tREMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)\n \tPROGRAMS += $(REMOTE_CURL_NAMES) git-http-fetch$X\n \tcurl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)\n \tifeq \"$(curl_check)\" \"070908\"\n \t\tifndef NO_EXPAT\n-- \n1.6.6.283.g42b20a\n"},{"id":"132119","messageId":"20100119165858.GA24065@Knoppix","threadId":"22289","inReplyTo":"1263915552-32537-1-git-send-email-j6t@kdbg.org","subject":"Re: [PATCH] Makefile: honor NO_CURL when setting REMOTE_CURL_* variables","fromName":"Ilari Liusvaara","fromEmail":"ilari.liusvaara@elisanet.fi","sentAt":"2010-01-19T16:58:58Z","receivedAt":"2010-01-19T16:58:58Z","isPatch":true,"sender":{"key":"ilari.liusvaara@elisanet.fi","avatar":null},"body":"On Tue, Jan 19, 2010 at 04:39:12PM +0100, Johannes Sixt wrote:\n> Previously, these variables were set before there was a chance to set\n> NO_CURL.\n> \n> This made a difference only during 'make install', because by installing\n> $(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY),\n> which was never installed. On Windows, this fails; on Unix, stale symbolic\n> links are created.\n \n\n\nI didn't even compile-test it, but based on quick look I don't see any\nobivous mistakes. There are no references to REMOTE_CURL_* in section\nmoved over, and the variable values should not differ unless section skipped\nsets NO_CURL. So:\n\nAcked-by: Ilari Liusvaara \n\n-Ilari\n"},{"id":"132146","messageId":"7vockp7jtj.fsf@alter.siamese.dyndns.org","threadId":"22289","inReplyTo":"20100119165858.GA24065@Knoppix","subject":"Re: [PATCH] Makefile: honor NO_CURL when setting REMOTE_CURL_* variables","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-19T23:31:52Z","receivedAt":"2010-01-19T23:31:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ilari Liusvaara writes:\n\n> On Tue, Jan 19, 2010 at 04:39:12PM +0100, Johannes Sixt wrote:\n>> Previously, these variables were set before there was a chance to set\n>> NO_CURL.\n>> \n>> This made a difference only during 'make install', because by installing\n>> $(REMOTE_CURL_ALIASES), the rule tries to access $(REMOTE_CURL_PRIMARY),\n>> which was never installed. On Windows, this fails; on Unix, stale symbolic\n>> links are created.\n> \n> \n>\n> I didn't even compile-test it, but based on quick look I don't see any\n> obivous mistakes. There are no references to REMOTE_CURL_* in section\n> moved over, and the variable values should not differ unless section skipped\n> sets NO_CURL. So:\n>\n> Acked-by: Ilari Liusvaara \n>\n> -Ilari\n\nThanks.\n"}]}