| author | Jay Cotton <Jay.Cotton@Oracle.com> |
| Sat, 14 Jan 2017 13:25:29 -0800 | |
| changeset 7577 | 6be97fb992c4 |
| parent 5243 | cb29cf94919d |
| permissions | -rw-r--r-- |
|
5243
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Changes needed to get serf to build on Solaris. Taken from: |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
http://mail-archives.apache.org/mod_mbox/subversion-dev/201411.mbox/<[email protected]> |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
These changes are already known upstream. |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- serf-1.3.8/SConstruct.orig 2015-03-25 06:42:50.687989565 -0700 |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ serf-1.3.8/SConstruct 2015-03-25 06:44:01.084907971 -0700 |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -210,7 +210,7 @@ |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# Unfortunately we can't set the .dylib compatibility_version option separately |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
# from current_version, so don't use the PATCH level to avoid that build and |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
# runtime patch levels have to be identical. |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
-env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+#env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
|
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
LIBNAME = 'libserf-%d' % (MAJOR,) |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
if sys.platform != 'win32': |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
@@ -248,6 +248,7 @@ |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
|
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
if sys.platform == 'sunos5': |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
env.Append(LIBS='m') |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ env['PLATFORM'] = 'posix' |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
else: |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
# Warning level 4, no unused argument warnings |
|
cb29cf94919d
PSARC 2015/152 serf - High-performance asynchronous HTTP client library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
env.Append(CCFLAGS=['/W4', '/wd4100']) |