[gentoo-commits] gentoo-x86 commit in media-plugins/gimp-lensfun/files: gimp-lensfun-0.2.2-build.patch

[Markos Chandras (hwoarang)]

hwoarang    12/09/30 17:47:06

  Added:                gimp-lensfun-0.2.2-build.patch
  Log:
  Build system fixes thanks to Julian Ospald (hasufell). Bug #436660
  
  (Portage version: 2.1.11.23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.2-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.2-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.2-build.patch?rev=1.1&content-type=text/plain

Index: gimp-lensfun-0.2.2-build.patch
===================================================================
From: Julian Ospald <hasufell@g.o>
Date: Sun Sep 30 13:22:40 UTC 2012
Subject: build system

	respect CC, CFLAGS and LDFLAGS
	https://bugs.gentoo.org/show_bug.cgi?id=436660

--- Makefile
+++ Makefile
@@ -1,8 +1,9 @@
-CFLAGS = -O3 -Wall $(shell gimptool-2.0 --cflags && pkg-config --cflags lensfun exiv2) -fopenmp 
+CXXFLAGS ?= -O3
+CXXFLAGS += -Wall $(shell gimptool-2.0 --cflags && pkg-config --cflags lensfun exiv2) -fopenmp 
 LIBS = $(shell gimptool-2.0 --libs && pkg-config --libs lensfun exiv2)
 PLUGIN = gimplensfun
 SOURCES = src/gimplensfun.c
-CC = g++
+CXX ?= g++
 # END CONFIG ##################################################################
 
 .PHONY: all install userinstall clean uninstall useruninstall
@@ -12,10 +13,10 @@
 OBJECTS = $(subst .c,.o,$(SOURCES))
 
 $(PLUGIN): $(OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 %.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c -o $@ $*.c
+	$(CXX) $(CXXFLAGS) -c -o $@ $*.c
 	
 install: $(PLUGIN)
 	@gimptool-2.0 --install-admin-bin $^