Patchwork hg: link osutil.so to libsocket on Solaris/illumos (issue6299)

login
register
mail settings
Submitter via Mercurial-devel
Date April 13, 2020, 1:34 p.m.
Message ID <VI1PR05MB5567269DF8EBB683836F8736CFDD0@VI1PR05MB5567.eurprd05.prod.outlook.com>
Download mbox | patch
Permalink /patch/46099/
State Accepted
Headers show

Comments

via Mercurial-devel - April 13, 2020, 1:34 p.m.
# HG changeset patch
# User Alexander Pyhalov <apyhalov@gmail.com>
# Date 1586784613 -10800
#      Mon Apr 13 16:30:13 2020 +0300
# Node ID 3fb3e898a7ac8b669347a5e75d1904ef876ca07a
# Parent  1b8fd4af33189c84feadb47c74d659ec31cde3b9
hg: link osutil.so to libsocket on Solaris/illumos (issue6299)
Yuya Nishihara - April 15, 2020, 6:08 a.m.
On Mon, 13 Apr 2020 13:34:34 +0000, Alexander Pyhalov via Mercurial-devel wrote:
> # HG changeset patch
> # User Alexander Pyhalov <apyhalov@gmail.com>
> # Date 1586784613 -10800
> #      Mon Apr 13 16:30:13 2020 +0300
> # Node ID 3fb3e898a7ac8b669347a5e75d1904ef876ca07a
> # Parent  1b8fd4af33189c84feadb47c74d659ec31cde3b9
> hg: link osutil.so to libsocket on Solaris/illumos (issue6299)

Queued for stable, thanks.

Patch

diff -r 1b8fd4af3318 -r 3fb3e898a7ac setup.py
--- a/setup.py  Thu Apr 09 16:06:03 2020 +0530
+++ b/setup.py  Mon Apr 13 16:30:13 2020 +0300
@@ -1313,6 +1313,9 @@ 
 if sys.platform == 'darwin':
     osutil_ldflags += ['-framework', 'ApplicationServices']
 
+if sys.platform == 'sunos5':
+    osutil_ldflags += ['-lsocket']
+
 xdiff_srcs = [
     'mercurial/thirdparty/xdiff/xdiffi.c',
     'mercurial/thirdparty/xdiff/xprepare.c',