| author | Yiteng Zhang <yiteng.zhang@oracle.com> |
| Thu, 20 Aug 2015 01:17:21 -0700 | |
| branch | s11u2-sru |
| changeset 4799 | f6da2b76c51b |
| parent 174 | 187aa0541610 |
| permissions | -rw-r--r-- |
|
4799
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
1 |
Adjusted to include all the libraries needed to successfully link on Solaris. |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
2 |
|
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
3 |
Note that on S11, the LIBS line will need to be: |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
4 |
LIBS = $(BLANK_AT_MAKETIME) -lsocket -lresolv -lnsl -lgen |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
5 |
as -lsocket and -lnsl have not yet been subsumed into libc. |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
6 |
|
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
7 |
This patch needs to be sent upstream, but needs to be reworked first. |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
8 |
|
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
9 |
--- tests/server/Makefile.in.orig 2014-09-10 12:16:40.748828978 -0700 |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
10 |
+++ tests/server/Makefile.in 2014-09-10 12:17:11.065886554 -0700 |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
11 |
@@ -377,7 +377,7 @@ |
|
174
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
LIBOBJS = @LIBOBJS@ |
|
4799
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
13 |
|
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
14 |
# Prevent LIBS from being used for all link targets |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
15 |
-LIBS = $(BLANK_AT_MAKETIME) |
|
f6da2b76c51b
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
174
diff
changeset
|
16 |
+LIBS = $(BLANK_AT_MAKETIME) -lresolv -lgen |
|
174
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
LIBTOOL = @LIBTOOL@ |
|
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
LIPO = @LIPO@ |
|
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
LN_S = @LN_S@ |