svn commit: r385005 - branches/2015Q2/graphics/cimg/files

[Thierry Thomas]

Author: thierry
Date: Wed Apr 29 19:14:28 2015
New Revision: 385005
URL: https://svnweb.freebsd.org/changeset/ports/385005

Log:
  MFH: r384603
  
  At some point, LDFLAGS got lost; reintroduce it, because it is required
  when libgfortran is linked with Gcc.
  
  Reminded by:	jbeich
  Approved by:	portmgr (fix pkg-fallout errors)

Modified:
  branches/2015Q2/graphics/cimg/files/patch-examples__Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/graphics/cimg/files/patch-examples__Makefile
==============================================================================
--- branches/2015Q2/graphics/cimg/files/patch-examples__Makefile	Wed Apr 29 19:08:04 2015	(r385004)
+++ branches/2015Q2/graphics/cimg/files/patch-examples__Makefile	Wed Apr 29 19:14:28 2015	(r385005)
@@ -107,7 +107,7 @@
  CIMG_BOARD_LIBS = -lboard
  
 +# Flags to compile on FreeBSD
-+CIMG_FREEBSD_LDFLAGS = -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
++CIMG_FREEBSD_LDFLAGS = $(LDFLAGS) -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
 +
  # Flags to compile on Sun Solaris
  CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
@@ -122,15 +122,18 @@
  all
  
  olinux:
-@@ -378,6 +382,7 @@ $(CIMG_ZLIB_CFLAGS) \
+@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \
  $(CIMG_CURL_CFLAGS) \
  $(CIMG_OPENCV_CFLAGS) \
  $(CIMG_MAGICK_CFLAGS) \
 +$(CIMG_LAPACK_CFLAGS) \
  $(CIMG_FFTW3_CFLAGS)" \
  "CONF_LIBS = \
++$(CIMG_FREEBSD_LDFLAGS) \
  $(CIMG_X11_LIBS) \
-@@ -389,6 +394,7 @@ $(CIMG_PNG_LIBS) \
+ $(CIMG_XSHM_LIBS) \
+ $(CIMG_XRANDR_LIBS) \
+@@ -389,6 +395,7 @@ $(CIMG_PNG_LIBS) \
  $(CIMG_JPEG_LIBS) \
  $(CIMG_ZLIB_LIBS) \
  $(CIMG_CURL_LIBS) \