<
8000
script type="application/json" data-target="react-app.embeddedData">{"payload":{"commit":{"oid":"79b03dbb3304539c6599593397c6a6b63b6a6ad9","url":"/postgres/postgres/commit/79b03dbb3304539c6599593397c6a6b63b6a6ad9","authoredDate":"2024-01-23T20:37:49.000+01:00","committedDate":"2024-01-23T20:37:49.000+01:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eSupport shared libraries on Android (using make)\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"While the rest of the make build system maps Android to Linux, Android\nuses unversioned shared libraries (like \"libpq.so\"). This patch makes\nit so. (Meson already supported it.)\n\nReported-by: Matthias Kuhn \u0026lt;matthias@opengis.ch\u0026gt;\nDiscussion: \u003ca href=\"https://www.postgresql.org/message-id/flat/CAC7zN94TdsHhY88XkroJzSMx7E%3DBQpV9LKKjNSEnTM04ihoWCA%40mail.gmail.com\" rel=\"nofollow\"\u003ehttps://www.postgresql.org/message-id/flat/CAC7zN94TdsHhY88XkroJzSMx7E%3DBQpV9LKKjNSEnTM04ihoWCA%40mail.gmail.com\u003c/a\u003e","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},"parents":["f4447af5b1a644af89e065410cdb12fe776cac47"],"globalRelayId":"C_kwDOAA4m0toAKDc5YjAzZGJiMzMwNDUzOWM2NTk5NTkzMzk3YzZhNmI2M2I2YTZhZDk","sha1":"f4447af5b1a644af89e065410cdb12fe776cac47","sha2":"79b03dbb3304539c6599593397c6a6b63b6a6ad9"},"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":182,"text":"@@ -183,6 +183,11 @@ endif","html":"@@ -183,6 +183,11 @@ endif","displayNoNewLineWarning":false,"position":0,"left":182,"right":182},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":183,"text":" ifeq ($(PORTNAME), linux)","html":" ifeq ($(PORTNAME), linux)","displayNoNewLineWarning":false,"position":1,"left":183,"right":183},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":184,"text":" LINK.shared\t\t= $(COMPILER) -shared","html":" LINK.shared\t\t= $(COMPILER) -shared","displayNoNewLineWarning":false,"position":2,"left":184,"right":184},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":185,"text":" ifdef soname","html":" ifdef soname","displayNoNewLineWarning":false,"position":3,"left":185,"right":185},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":186,"text":"+ ifneq (,$(findstring linux-android,$(host_os)))","html":"+ ifneq (,$(findstring linux-android,$(host_os)))","displayNoNewLineWarning":false,"position":4,"left":185,"right":186},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":187,"text":"+ # Android uses unversioned shared libraries","html":"+ # Android uses unversioned shared libraries","displayNoNewLineWarning":false,"position":5,"left":185,"right":187},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":188,"text":"+ shlib\t\t= $(shlib_bare)","html":"+ shlib\t\t= $(shlib_bare)","displayNoNewLineWarning":false,"position":6,"left":185,"right":188},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":189,"text":"+ soname\t\t= $(shlib_bare)","html":"+ soname\t\t= $(shlib_bare)","displayNoNewLineWarning":false,"position":7,"left":185,"right":189},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":190,"text":"+ endif","html":"+ endif","displayNoNewLineWarning":false,"position":8,"left":185,"right":190},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":191,"text":" LINK.shared\t\t+= -Wl,-soname,$(soname)","html":" LINK.shared\t\t+= -Wl,-soname,$(soname)","displayNoNewLineWarning":false,"position":9,"left":186,"right":191},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":192,"text":" endif","html":" endif","displayNoNewLineWarning":false,"position":10,"left":187,"right":192},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":193,"text":" BUILD.exports\t\t= ( echo '{ global:'; $(AWK) '/^[^\\#]/ {printf \"%s;\\n\",$$1}' $\u003c; echo ' local: *; };' ) \u003e$@","html":" BUILD.exports\t\t= ( echo \u0026#39;{ global:\u0026#39;; $(AWK) \u0026#39;/^[^\\#]/ {printf \u0026quot;%s;\\n\u0026quot;,$$1}\u0026#39; $\u0026lt;; echo \u0026#39; local: *; };\u0026#39; ) \u0026gt;$@","displayNoNewLineWarning":false,"position":11,"left":188,"right":193}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":465,"linesChanged":5,"newTreeEntry":{"lineCount":465,"path":"src/Makefile.shlib","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"src/Makefile.shlib","mode":100644},"linesAdded":5,"linesDeleted":0,"path":"src/Makefile.shlib","pathDigest":"9b7630fa03532a46eecaf1342172c92a0d6f2e754e59fff46cc52b0ba421aff9","status":"MODIFIED","truncatedReason":null,"oldOid":"f4447af5b1a644af89e065410cdb12fe776cac47","newOid":"79b03dbb3304539c6599593397c6a6b63b6a6ad9","copilotChatReference":null,"deletedSha":"f4447af5b1a644af89e065410cdb12fe776cac47","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/79b03dbb3304539c6599593397c6a6b63b6a6ad9","fileTreeExpanded":true,"headerInfo":{"additions":5,"deletions":0,"filesChanged":1,"filesChangedString":"1"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":1,"truncated":false,"byteCount":445,"lineShownCount":12},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"p_T7y5YHexgeVOcATmhvwVq1UUgqPc6BeI3xeOoAguG35DkTkK7-2P83MSRiEiVlCfYTVGbS-_lm8SqYcbjsZw"},"/users/diffview?diff=unified":{"post":"JFPkt71qJYVlqR2Ir5yM11WjPtDpTq-_6PIKUrw4cL40QyZvu8OgRYTKy6yD5sZzBuB8zKWhmsf2jtGyJ4AeOA"},"/notifications/thread":{"post":"eWT_OV2PYW71ZxN1lqxXIz7fvCzaZXrqw5Nf7AZpVV9Qe-QtW31KUsY8bPnbz1b9ZbpSlpvdxoSBKFQt4b2J0g"}}},"title":"Support shared libraries on Android (using make) · postgres/postgres@79b03db","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 +5
-0
lines changed Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -183,6 +183,11 @@ endif
183183ifeq ($(PORTNAME), linux)
184184 LINK.shared = $(COMPILER) -shared
185185 ifdef soname
186+ ifneq (,$(findstring linux-android,$(host_os)))
187+ # Android uses unversioned shared libraries
188+ shlib = $(shlib_bare)
189+ soname = $(shlib_bare)
190+ endif
186191 LINK.shared += -Wl,-soname,$(soname)
187192 endif
188193 BUILD.exports = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "
37A9
%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
You can’t perform that action at this time.
0 commit comments