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