Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openexr/patches/009-include.patch
author Jingning Ji <jingning.ji@oracle.com>
Tue, 14 Feb 2017 16:51:42 -0800
changeset 7697 8a41b565423d
permissions -rw-r--r--
23119772 Upgrade openexr to 2.2.0

Addresses upgrading build error by changing the order of including header files.
Will not send upstream.

--- IlmImf/Makefile.in	2016-11-18 10:46:05.906674308 +0000
+++ IlmImf/Makefile.in	2016-11-18 10:47:02.887998521 +0000
@@ -458,9 +458,9 @@
 		 ImfOptimizedPixelReading.h
 
 EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
-INCLUDES = @ILMBASE_CXXFLAGS@ \
-	   -I$(top_builddir)  \
-	   -I$(top_srcdir)/config
+INCLUDES = -I$(top_builddir)  \
+	   -I$(top_srcdir)/config \
+	   @ILMBASE_CXXFLAGS@
 
 CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
 b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
--- IlmImfUtil/Makefile.in	2016-11-18 10:46:24.851912251 +0000
+++ IlmImfUtil/Makefile.in	2016-11-18 10:47:41.785326043 +0000
@@ -265,10 +265,10 @@
 libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
 libIlmImfUtilincludedir = $(includedir)/OpenEXR
 EXTRA_DIST = CMakeLists.txt
-INCLUDES = @ILMBASE_CXXFLAGS@ \
-	   -I$(top_builddir)  \
+INCLUDES = -I$(top_builddir)  \
 	   -I$(top_srcdir)/IlmImf  \
-	   -I$(top_srcdir)/config
+	   -I$(top_srcdir)/config \
+	   @ILMBASE_CXXFLAGS@
 
 all: all-am
upstream/oracle/userland-gate