<
8000
script type="application/json" data-target="react-app.embeddedData">{"payload":{"commit":{"oid":"4444317f370cbbd6a9bb62d70dd8f1f062952ef4","url":"/postgres/postgres/commit/4444317f370cbbd6a9bb62d70dd8f1f062952ef4","authoredDate":"2022-08-24T20:38:28.000-07:00","committedDate":"2022-08-24T20:39:46.000-07:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eaix: Fix SHLIB_EXPORTS reference in VPATH builds\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"The dependencies here aren't quite right independent of vpath builds or not,\nbut this at least makes vpath builds succeed. And it's pretty rare to change\nthe exports.txt file anyway... The referenced thread has a patch that will\nclean that up further.\n\nDiscussion: \u003ca href=\"https://postgr.es/m/20220820174213.d574qde4ptwdzoqz@awork3.anarazel.de\" rel=\"nofollow\"\u003ehttps://postgr.es/m/20220820174213.d574qde4ptwdzoqz@awork3.anarazel.de\u003c/a\u003e","authors":[{"login":"anarazel","displayName":"Andres Freund","avatarUrl":"https://avatars.githubusercontent.com/u/1598211?v=4","path":"/anarazel","isGitHub":false}],"committerAttribution":false,"committer":{"login":"anarazel","displayName":"Andres Freund","avatarUrl":"https://avatars.githubusercontent.com/u/1598211?v=4","path":"/anarazel","isGitHub":false},"parents":["05bf551040ba161ddfbf7da308d61d2b7b425bf3"],"globalRelayId":"C_kwDOAA4m0toAKDQ0NDQzMTdmMzcwY2JiZDZhOWJiNjJkNzBkZDhmMWYwNjI5NTJlZjQ","sha1":"05bf551040ba161ddfbf7da308d61d2b7b425bf3","sha2":"4444317f370cbbd6a9bb62d70dd8f1f062952ef4"},"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":306,"text":"@@ -307,7 +307,7 @@ $(shlib): $(OBJS) | $(SHLIB_PREREQS)","html":"@@ -307,7 +307,7 @@ $(shlib): $(OBJS) | $(SHLIB_PREREQS)","displayNoNewLineWarning":false,"position":0,"left":306,"right":306},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":307,"text":" ifeq (,$(SHLIB_EXPORTS))","html":" ifeq (,$(SHLIB_EXPORTS))","displayNoNewLineWarning":false,"position":1,"left":307,"right":307},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":308,"text":" \t$(MKLDEXPORT) $(stlib) $(shlib) \u003e$(exports_file)","html":" \t$(MKLDEXPORT) $(stlib) $(shlib) \u0026gt;$(exports_file)","displayNoNewLineWarning":false,"position":2,"left":308,"right":308},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":309,"text":" else","html":" else","displayNoNewLineWarning":false,"position":3,"left":309,"right":309},{"stylingDirective":null,"type":"DELETION","blobLineNumber":310,"text":"-\t( echo '#! $(shlib)'; $(AWK) '/^[^#]/ {printf \"%s\\n\",$$1}' $(SHLIB_EXPORTS) ) \u003e$(exports_file)","html":"-\t( echo \u0026#39;#! $(shlib)\u0026#39;; $(AWK) \u0026#39;/^[^#]/ {printf \u0026quot;%s\\n\u0026quot;,$$1}\u0026#39; $(SHLIB_EXPORTS) ) \u0026gt;$(exports_file)","displayNoNewLineWarning":false,"position":4,"left":310,"right":309},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":310,"text":"+\t( echo '#! $(shlib)'; $(AWK) '/^[^#]/ {printf \"%s\\n\",$$1}' ${srcdir}/$(SHLIB_EXPORTS) ) \u003e$(exports_file)","html":"+\t( echo \u0026#39;#! $(shlib)\u0026#39;; $(AWK) \u0026#39;/^[^#]/ {printf \u0026quot;%s\\n\u0026quot;,$$1}\u0026#39; $\u003cspan class=\"x x-first x-last\"\u003e{srcdir}/$\u003c/span\u003e(SHLIB_EXPORTS) ) \u0026gt;$(exports_file)","displayNoNewLineWarning":false,"position":5,"left":310,"right":310},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":311,"text":" endif","html":" endif","displayNoNewLineWarning":false,"position":6,"left":311,"right":311},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":312,"text":" \t$(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)","html":" \t$(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)","displayNoNewLineWarning":false,"position":7,"left":312,"right":312},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":313,"text":" \trm -f $(stlib)","html":" \trm -f $(stlib)","displayNoNewLineWarning":false,"position":8,"left":313,"right":313}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":474,"linesChanged":2,"newTreeEntry":{"lineCount":474,"path":"src/Makefile.shlib","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"src/Makefile.shlib","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"src/Makefile.shlib","pathDigest":"9b7630fa03532a46eecaf1342172c92a0d6f2e754e59fff46cc52b0ba421aff9","status":"MODIFIED","truncatedReason":null,"oldOid":"05bf551040ba161ddfbf7da308d61d2b7b425bf3","newOid":"4444317f370cbbd6a9bb62d70dd8f1f062952ef4","copilotChatReference":null,"deletedSha":"05bf551040ba161ddfbf7da308d61d2b7b425bf3","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/4444317f370cbbd6a9bb62d70dd8f1f062952ef4","fileTreeExpanded":true,"headerInfo":{"additions":1,"deletions":1,"filesChanged":1,"filesChangedString":"1"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":1,"truncated":false,"byteCount":465,"lineShownCount":9},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"dGWPx4zGfsY-_TNuvArPXsgjL_kKTyLlpa1EPy4553xciSz-sM7u2SZA8ARa6mI6MAE1J2qN2EdbEilj2ytXxw"},"/users/diffview?diff=unified":{"post":"ie1jp9_zSRNQOcBJHgsb_HHUWgEJ8xqSH-H_SrB1raWhAcCe4_vZDEiEAyP467aYifZA32kx4DDhXpIWRWcdHg"},"/notifications/thread":{"post":"Fyex9KXGwmbONRuMctyRoZ6Jj_mpRdRf9Jrr01SEvKHASD8OSxe7yCpIJeRODQf7Cj8KJbUVb7Ypg8YyKWvyWw"}}},"title":"aix: Fix SHLIB_EXPORTS reference in VPATH builds · postgres/postgres@4444317","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,"react_diff_line_type_character_correction":true}}}
File tree Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change @@ -307,7 +307,7 @@ $(shlib): $(OBJS) | $(SHLIB_PREREQS)
307307ifeq (,$(SHLIB_EXPORTS))
308308 $(MKLDEXPORT) $(stlib) $(shlib) >$(exports_file)
309309else
310- ( echo '#! $(shlib)'; $(AWK) '/^[^#]/ {printf "%s\n",$$1}' $(SHLIB_EXPORTS) ) >$(exports_file)
310+ ( echo '#! $(shlib)'; $(AWK) '/^[^#]/ {printf "%s\n",$$1}' ${srcdir}/$ (SHLIB_EXPORTS) ) >$(exports_file)
311311endif
312312 $(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)
313313 rm -f $(stlib)
You can’t perform that action at this time.
0 commit comments