Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/shotwell/files: shotwell-0.13.1-ldflags.patch
Date: Sun, 28 Oct 2012 19:30:35
Message-Id: 20121028193002.45C3821600@flycatcher.gentoo.org
1 hwoarang 12/10/28 19:30:02
2
3 Added: shotwell-0.13.1-ldflags.patch
4 Log:
5 Respect ldflags. Bug #435048. Version bump. #438604
6
7 (Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
8
9 Revision Changes Path
10 1.1 media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch?rev=1.1&content-type=text/plain
14
15 Index: shotwell-0.13.1-ldflags.patch
16 ===================================================================
17 Respect LDFLAGS when building C files. Bug #435048
18 Patch hasn't been sent upstream yet.
19 Index: shotwell-0.13.1/Makefile
20 ===================================================================
21 --- shotwell-0.13.1.orig/Makefile
22 +++ shotwell-0.13.1/Makefile
23 @@ -697,7 +697,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
24 @
25
26 $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
27 - $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
28 + $(CC) -c $(VALA_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
29
30 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
31 $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
32 Index: shotwell-0.13.1/plugins/Makefile.plugin.mk
33 ===================================================================
34 --- shotwell-0.13.1.orig/plugins/Makefile.plugin.mk
35 +++ shotwell-0.13.1/plugins/Makefile.plugin.mk
36 @@ -54,7 +54,7 @@ $(CFILES): .stamp
37 @
38
39 $(OFILES): %.o: %.c $(CFILES)
40 - $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
41 + $(CC) -c $(CFLAGS) $(LDFLAGS) $(DEFINES) -I../.. $(CFILES)
42
43 $(PLUGIN).so: $(OFILES)
44 $(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@