| author | Jingning Ji <jingning.ji@oracle.com> |
| Tue, 14 Feb 2017 16:51:42 -0800 | |
| changeset 7697 | 8a41b565423d |
| parent 147 | 5af6875cbf70 |
| permissions | -rw-r--r-- |
|
7697
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
1 |
Appends -norunpath to address publish error. |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
2 |
Will not send upstream. |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
3 |
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
4 |
--- ltmain.sh 2016-11-17 10:54:17.548942670 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
5 |
+++ ltmain.sh 2016-11-17 10:58:10.937162981 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
6 |
@@ -7332,7 +7332,8 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
7 |
save_ifs="$IFS"; IFS='~' |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
8 |
for cmd in $cmds; do |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
9 |
IFS="$save_ifs" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
10 |
- eval cmd=\"$cmd\" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
11 |
+ # Append the command to remove runpath for CC. |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
12 |
+ eval cmd=\"$cmd -norunpath\" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
13 |
$opt_silent || {
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
14 |
func_quote_for_expand "$cmd" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
15 |
eval "func_echo $func_quote_for_expand_result" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
16 |
@@ -7755,7 +7756,7 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
17 |
func_warning "\`$output' will be relinked during installation" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
18 |
else |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
19 |
if test "$fast_install" != no; then |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
20 |
- link_command="$finalize_var$compile_command$finalize_rpath" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
21 |
+ link_command="$finalize_var$compile_command -norunpath" |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
22 |
if test "$fast_install" = yes; then |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
23 |
relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
147
diff
changeset
|
24 |
else |