| author | Jingning Ji <jingning.ji@oracle.com> |
| Tue, 14 Feb 2017 16:51:42 -0800 | |
| changeset 7697 | 8a41b565423d |
| permissions | -rw-r--r-- |
|
7697
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
1 |
Addresses upgrading build error by changing the library path order to search local path first. |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
2 |
There's already a bug posted here https://github.com/openexr/openexr/issues/200. |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
3 |
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
4 |
--- IlmImf/Makefile.in 2016-11-18 10:47:02.887998521 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
5 |
+++ IlmImf/Makefile.in 2016-11-21 15:02:49.292844920 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
6 |
@@ -112,7 +112,8 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
7 |
libIlmImf_la_OBJECTS = $(am_libIlmImf_la_OBJECTS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
8 |
libIlmImf_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
9 |
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
10 |
- $(CXXFLAGS) $(libIlmImf_la_LDFLAGS) $(LDFLAGS) -o $@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
11 |
+ $(CXXFLAGS) $(libIlmImf_la_LIBADD) $(libIlmImf_la_LDFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
12 |
+ $(LDFLAGS) -o $@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
13 |
PROGRAMS = $(noinst_PROGRAMS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
14 |
am_b44ExpLogTable_OBJECTS = b44ExpLogTable.$(OBJEXT) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
15 |
b44ExpLogTable_OBJECTS = $(am_b44ExpLogTable_OBJECTS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
16 |
@@ -535,7 +536,7 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
17 |
rm -f "$${dir}/so_locations"; \
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
18 |
done |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
19 |
libIlmImf.la: $(libIlmImf_la_OBJECTS) $(libIlmImf_la_DEPENDENCIES) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
20 |
- $(libIlmImf_la_LINK) -rpath $(libdir) $(libIlmImf_la_OBJECTS) $(libIlmImf_la_LIBADD) $(LIBS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
21 |
+ $(libIlmImf_la_LINK) -rpath $(libdir) $(libIlmImf_la_OBJECTS) $(LIBS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
22 |
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
23 |
clean-noinstPROGRAMS: |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
24 |
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
25 |
--- IlmImfUtil/Makefile.in 2016-11-18 10:53:59.740461589 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
26 |
+++ IlmImfUtil/Makefile.in 2016-11-21 14:37:33.743463495 +0000 |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
27 |
@@ -80,7 +80,8 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
28 |
libIlmImfUtil_la_OBJECTS = $(am_libIlmImfUtil_la_OBJECTS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
29 |
libIlmImfUtil_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
30 |
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
31 |
- $(CXXFLAGS) $(libIlmImfUtil_la_LDFLAGS) $(LDFLAGS) -o $@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
32 |
+ $(CXXFLAGS) $(libIlmImfUtil_la_LIBADD) $(libIlmImfUtil_la_LDFLAGS) \ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
33 |
+ $(LDFLAGS) -o $@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
34 |
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
35 |
depcomp = $(SHELL) $(top_srcdir)/depcomp |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
36 |
am__depfiles_maybe = depfiles |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
37 |
@@ -336,7 +337,7 @@ |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
38 |
rm -f "$${dir}/so_locations"; \
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
39 |
done |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
40 |
libIlmImfUtil.la: $(libIlmImfUtil_la_OBJECTS) $(libIlmImfUtil_la_DEPENDENCIES) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
41 |
- $(libIlmImfUtil_la_LINK) -rpath $(libdir) $(libIlmImfUtil_la_OBJECTS) $(libIlmImfUtil_la_LIBADD) $(LIBS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
42 |
+ $(libIlmImfUtil_la_LINK) -rpath $(libdir) $(libIlmImfUtil_la_OBJECTS) $(LIBS) |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
43 |
|
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
44 |
mostlyclean-compile: |
|
8a41b565423d
23119772 Upgrade openexr to 2.2.0
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
45 |
-rm -f *.$(OBJEXT) |