[freeimage] 25/47: Makefile: add LFS_CFLAGS to COMPILERFLAGS

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository freeimage.

commit b67b20b76641b9a8b620d8ed7be6062a07d25b36
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Oct 29 13:37:35 2010 +0200

    Makefile: add LFS_CFLAGS to COMPILERFLAGS
---
 debian/patches/makefile_modifications.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/patches/makefile_modifications.patch b/debian/patches/makefile_modifications.patch
index caddccb..2f2bade 100644
--- a/debian/patches/makefile_modifications.patch
+++ b/debian/patches/makefile_modifications.patch
@@ -6,7 +6,7 @@ Index: freeimage/Makefile.fip
 ===================================================================
 --- freeimage.orig/Makefile.fip
 +++ freeimage/Makefile.fip
-@@ -4,18 +4,20 @@
+@@ -4,18 +4,21 @@
  include fipMakefile.srcs
  
  # General configuration variables:
@@ -29,6 +29,7 @@ Index: freeimage/Makefile.fip
 -COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden
 -LIBRARIES = -lstdc++
 +COMPILERFLAGS ?= -O3 -fexceptions -fvisibility=hidden
++COMPILERFLAGS += $(shell getconf LFS_CFLAGS)
 +LIBRARIES = -lmng -lz -lpng -lm -ljpeg -lopenjpeg $(shell pkg-config --libs OpenEXR)
  
  MODULES = $(SRCS:.c=.o)
@@ -54,7 +55,7 @@ Index: freeimage/Makefile.gnu
 ===================================================================
 --- freeimage.orig/Makefile.gnu
 +++ freeimage/Makefile.gnu
-@@ -4,18 +4,20 @@
+@@ -4,18 +4,21 @@
  include Makefile.srcs
  
  # General configuration variables:
@@ -77,6 +78,7 @@ Index: freeimage/Makefile.gnu
 -COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
 -LIBRARIES = -lstdc++
 +COMPILERFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
++COMPILERFLAGS += $(shell getconf LFS_CFLAGS)
 +LIBRARIES = -ljpeg -lmng -lopenjpeg -lpng $(shell pkg-config --libs OpenEXR) -lz -lm
  
  MODULES = $(SRCS:.c=.o)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git