Commit 9a2fd356 authored by Cody Garver's avatar Cody Garver

Kill remaining patch, it was causing build failures.

parent 75243591
Description: pass compiler flags set in debian/rules to compiler
Author: Devid Antonio Filoni <d.filoni@ubuntu.com>
Index: shotwell-0.15.0~pr3/Makefile
===================================================================
--- shotwell-0.15.0~pr3.orig/Makefile 2013-09-26 11:20:27.486298924 +0200
+++ shotwell-0.15.0~pr3/Makefile 2013-09-26 11:20:27.482298924 +0200
@@ -42,7 +42,7 @@
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS)
+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-deprecated --enable-experimental $(USER_VALAFLAGS)
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
@@ -715,7 +715,7 @@
@
$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
+ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $<
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled
$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment