Gentoo Archives: gentoo-commits

From: "Nathan Phillip Brink (binki)" <binki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/discount/files: discount-2.1.6-portage-multilib-CFLAGS.patch
Date: Mon, 29 Jul 2013 04:55:05
Message-Id: 20130729045501.4CEE22171D@flycatcher.gentoo.org
1 binki 13/07/29 04:55:01
2
3 Added: discount-2.1.6-portage-multilib-CFLAGS.patch
4 Log:
5 Add app-text/discount for bug #294000 by Egil Hanger and jauhien. Imported from sunrise with fixes including CFLAGS, LDFLAGS, CPPFLAGS, sandbox, and shared/dynamic library support. Prefixed some generically-named binaries with 'mkd'.
6
7 (Portage version: 2.2.0_alpha177-r1/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)
8
9 Revision Changes Path
10 1.1 app-text/discount/files/discount-2.1.6-portage-multilib-CFLAGS.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/files/discount-2.1.6-portage-multilib-CFLAGS.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/files/discount-2.1.6-portage-multilib-CFLAGS.patch?rev=1.1&content-type=text/plain
14
15 Index: discount-2.1.6-portage-multilib-CFLAGS.patch
16 ===================================================================
17 From 9b95e9a2dce195a8dfbdbf3206494095b177d405 Mon Sep 17 00:00:00 2001
18 From: Nathan Phillip Brink <binki@g.o>
19 Date: Thu, 25 Jul 2013 01:14:14 -0400
20 Subject: [PATCH] =?UTF-8?q?Fix=20support=20for=20=E2=80=9C$=20CFLAGS=3D-m32=20./configure.sh=E2=80=9D=20by=20using=20CFLAGS=20for=20all=20build=20invokations=20of=20CC.?=
21 MIME-Version: 1.0
22 Content-Type: text/plain; charset=UTF-8
23 Content-Transfer-Encoding: 8bit
24
25 ---
26 Makefile.in | 14 +++++++-------
27 1 files changed, 7 insertions(+), 7 deletions(-)
28
29 diff --git a/Makefile.in b/Makefile.in
30 index 9bb438a..3bda63d 100644
31 --- a/Makefile.in
32 +++ b/Makefile.in
33 @@ -64,7 +64,7 @@ $(DESTDIR)$(LIBDIR):
34 @INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
35
36 version.o: version.c VERSION
37 - $(CC) -DVERSION=\"`cat VERSION`\" -c version.c
38 + $(CC) $(CFLAGS) -DVERSION=\"`cat VERSION`\" -c version.c
39
40 VERSION:
41 @true
42 @@ -76,23 +76,23 @@ blocktags: mktags
43
44 # example programs
45 @THEME@theme: theme.o $(MKDLIB) mkdio.h
46 -@THEME@ $(CC) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
47 +@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
48
49
50 mkd2html: mkd2html.o $(MKDLIB) mkdio.h
51 - $(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
52 + $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
53
54 markdown: main.o pgm_options.o $(MKDLIB)
55 - $(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
56 + $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
57
58 makepage: makepage.c pgm_options.o $(MKDLIB) mkdio.h
59 - $(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
60 + $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
61
62 pgm_options.o: pgm_options.c mkdio.h config.h
63 - $(CC) -I. -c pgm_options.c
64 + $(CC) $(CFLAGS) -I. -c pgm_options.c
65
66 main.o: main.c mkdio.h config.h
67 - $(CC) -I. -c main.c
68 + $(CC) $(CFLAGS) -I. -c main.c
69
70 $(MKDLIB): $(OBJS)
71 ./librarian.sh make $(MKDLIB) VERSION $(OBJS)
72 --
73 1.7.3.4