8000 Workaround for recursive make breakage · postgres/postgres@c667cc2 · GitHub
[go: up one dir, main page]
Skip to content
{"payload":{"commit":{"oid":"c667cc24e888dc4efe4c2412ad8dd13a190295e3","url":"/postgres/postgres/commit/c667cc24e888dc4efe4c2412ad8dd13a190295e3","authoredDate":"2011-01-13T09:32:06.000+02:00","committedDate":"2011-01-13T09:32:06.000+02:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eWorkaround for recursive make breakage\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"Changing a file two directory levels deep under src/backend/ would not\ncause the postgres binary to be rebuilt. This change fixes it, but no\none knows why.","authors":[{"login":"petere","displayName":"Peter Eisentraut","avatarUrl":"https://avatars.githubusercontent.com/u/105543?v=4","path":"/petere","isGitHub":false}],"committerAttribution":false,"committer":{"login":"petere","displayName":"Peter Eisentraut","avatarUrl":"https://avatars.githubusercontent.com/u/105543?v=4","path":"/petere","isGitHub":false},"pusher":null,"pushedDate":null,"parents":["35eb0958be476d58dcc8ba462d57384e74a62d88"],"globalRelayId":"MDY6Q29tbWl0OTI3NDQyOmM2NjdjYzI0ZTg4OGRjNGVmZTRjMjQxMmFkOGRkMTNhMTkwMjk1ZTM=","sha1":"35eb0958be476d58dcc8ba462d57384e74a62d88","sha2":"c667cc24e888dc4efe4c2412ad8dd13a190295e3"},"currentUser":null,"repo":{"id":927442,"defaultBranch":"master","name":"postgres","ownerLogin":"postgres","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2010-09-21T11:35:45.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/177543?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":33,"text":"@@ -34,7 +34,7 @@ objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS)","html":"@@ -34,7 +34,7 @@ objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS)","displayNoNewLineWarning":false,"position":0,"left":33,"right":33},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":34,"text":" expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))","html":" \u003cspan class=\"pl-smi\"\u003eexpand_subsys\u003c/span\u003e = \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003eforeach\u003c/span\u003e file,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003e1\u003c/span\u003e)\u003c/span\u003e,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003eif\u003c/span\u003e \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003efilter\u003c/span\u003e \u003cspan class=\"pl-c1\"\u003e%\u003c/span\u003e/objfiles.txt,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003efile\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003epatsubst\u003c/span\u003e ../../src/backend/\u003cspan class=\"pl-c1\"\u003e%\u003c/span\u003e,\u003cspan class=\"pl-c1\"\u003e%\u003c/span\u003e,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003eaddprefix\u003c/span\u003e \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003etop_builddir\u003c/span\u003e)\u003c/span\u003e/,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-c1\"\u003eshell\u003c/span\u003e cat \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003efile\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e,\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003efile\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e)\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":34,"right":34},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":35,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":2,"left":35,"right":35},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":36,"text":" # Parallel make trickery","html":" \u003cspan class=\"pl-c\"\u003e\u003cspan class=\"pl-c\"\u003e#\u003c/span\u003e Parallel make trickery\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":36,"right":36},{"stylingDirective":null,"type":"DELETION","blobLineNumber":37,"text":"-$(SUBDIROBJS): | $(SUBDIRS:%=%-recursive) ;","html":"-\u003cspan class=\"pl-en\"\u003e\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003eSUBDIROBJS\u003c/span\u003e)\u003c/span\u003e\u003c/span\u003e: \u003cspan class=\"x x-first x-last\"\u003e| \u003c/span\u003e\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003eSUBDIRS:%=%-recursive\u003c/span\u003e)\u003c/span\u003e ;","displayNoNewLineWarning":false,"position":4,"left":37,"right":36},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":37,"text":"+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;","html":"+\u003cspan class=\"pl-en\"\u003e\u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003eSUBDIROBJS\u003c/span\u003e)\u003c/span\u003e\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003eSUBDIRS:%=%-recursive\u003c/span\u003e)\u003c/span\u003e ;","displayNoNewLineWarning":false,"position":5,"left":37,"right":37},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":38,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":6,"left":38,"right":38},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":39,"text":" .PHONY: $(SUBDIRS:%=%-recursive)","html":" \u003cspan class=\"pl-c1\"\u003e.PHONY\u003c/span\u003e: \u003cspan class=\"pl-s\"\u003e$(\u003cspan class=\"pl-smi\"\u003eSUBDIRS:%=%-recursive\u003c/span\u003e)\u003c/span\u003e","displayNoNewLineWarning":false,"position":7,"left":39,"right":39},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":40,"text":" $(SUBDIRS:%=%-recursive):","html":" \u003cspan class=\"pl-smi\"\u003e$(SUBDIRS:%\u003c/span\u003e=%-recursive):","displayNoNewLineWarning":false,"position":8,"left":40,"right":40}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":48,"linesChanged":2,"newTreeEntry":{"lineCount":48,"path":"src/backend/common.mk","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"src/backend/common.mk","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"src/backend/common.mk","pathDigest":"c85a1f252057ed8ad49456fd7de368fac43e7664920a60706220521fe83a07d3","status":"MODIFIED","truncatedReason":null,"oldOid":"35eb0958be476d58dcc8ba462d57384e74a62d88","newOid":"c667cc24e888dc4efe4c2412ad8dd13a190295e3","copilotChatReference":null,"deletedSha":"35eb0958be476d58dcc8ba462d57384e74a62d88","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"repoOwnerGlobalRelayId":"MDEyOk9yZ2FuaXphdGlvbjE3NzU0Mw==","commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/postgres/postgres/commit/c667cc24e888dc4efe4c2412ad8dd13a190295e3","fileTreeExpanded":true,"headerInfo":{"additions":1,"deletions":1,"filesChanged":1,"filesChangedString":"1"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":1,"truncated":false,"byteCount":411,"lineShownCount":9},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"kUxWsIgsC2jhbjYca3oEXuYwqZ93lq-oNG5gJCFgWNAHibvfWl0Gu2Z1Q71_mEveC3zuwc54O3vWo-LLN1i0Mg"},"/users/diffview?diff=unified":{"post":"1XUDjhqvFtOn0otDOdFl3EUzYeNdAdwC6AGF4XNwkSBDsO7hyN4bACDJ_uItMypcqH8mveTvSNEKzAcOZUh9wg"},"/notifications/thread":{"post":"6U3ETr0jR0ASn-rtsVktaAteXG1Wlzz2iP8idhZIT1v9O1laEq7YbU-k_u3aDZAjJDpTlKZdkWsChRZb3Exy_A"}}},"title":"Workaround for recursive make breakage · postgres/postgres@c667cc2","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-2bfe39677d14.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"diff_ux_refresh_ssr_five":false,"diff_ux_refresh_ssr_ten":false,"show_pusher_on_commit_detail":false}}}

Commit c667cc2

Browse files
peterepetere
committed
Workaround for recursive make breakage
Changing a file two directory levels deep under src/backend/ would not cause the postgres binary to be rebuilt. This change fixes it, but no one knows why.
1 parent 35eb095 commit c667cc2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/backend/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS)
3434
expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file)))
3535

3636
# Parallel make trickery
37-
$(SUBDIROBJS): | $(SUBDIRS:%=%-recursive) ;
37+
$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
3838

3939
.PHONY: $(SUBDIRS:%=%-recursive)
4040
$(SUBDIRS:%=%-recursive):

0 commit comments

Comments
 (0)
0