author | Stacy Yeh <stacy.yeh@oracle.com> |
Tue, 01 Mar 2016 12:56:53 -0800 | |
changeset 5527 | 611b2d6efdfe |
permissions | -rw-r--r-- |
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
1 |
Add necessary flags for DSO_LDOPTS. |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
2 |
Do not plan to send upstream. |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
3 |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
--- a/ldap/sdks/c-sdk/config/SunOS5.mk 2015-10-13 23:37:03.388273000 +0800 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/ldap/sdks/c-sdk/config/SunOS5.mk 2015-10-13 23:37:18.652330000 +0800 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
@@ -217,5 +217,5 @@ |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
ifeq ($(OS_TEST),sun4u) |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
ULTRASPARC_LIBRARY = ultrasparc |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
ULTRASPARC_FILTER_LIBRARY = libatomic.so |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
-DSO_LDOPTS += -f $(ULTRASPARC_FILTER_LIBRARY) |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
+DSO_LDOPTS += -Wl,-f -Wl,$(ULTRASPARC_FILTER_LIBRARY) |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
endif |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
--- a/ldap/sdks/c-sdk/configure 2015-10-14 06:51:22.319008000 +0800 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
+++ b/ldap/sdks/c-sdk/configure 2015-10-14 06:52:01.010674000 +0800 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
@@ -5600,7 +5600,7 @@ |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
if test -z "$USE_64"; then |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
ULTRASPARC_LIBRARY=ultrasparc |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
ULTRASPARC_FILTER_LIBRARY=libatomic.so |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
- DSO_LDOPTS="$DSO_LDOPTS -f "'$(ULTRASPARC_FILTER_LIBRARY)' |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-f -Wl,"'$(ULTRASPARC_FILTER_LIBRARY)' |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
fi |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
fi |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
;; |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
--- a/ldap/sdks/c-sdk/configure Wed Oct 14 23:38:04 2015 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
25 |
+++ b/ldap/sdks/c-sdk/configure Wed Oct 14 23:38:47 2015 |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
26 |
@@ -5503,7 +5503,7 @@ |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
27 |
CXX="$CXX -m64" |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
28 |
fi |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
29 |
LD='$(CC)' |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
30 |
- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
31 |
+ DSO_LDOPTS='-shared -Wl,-h -Wl,$(notdir $@)' |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
32 |
DSO_CFLAGS=-fPIC |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
33 |
CFLAGS="$CFLAGS -Wall" |
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
34 |
CXXFLAGS="$CXXFLAGS -Wall" |