Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-calculators/hcalc/files: 1.0-gentoo.patch
Date: Wed, 23 Feb 2011 07:32:18
Message-Id: 20110223073208.4877820054@flycatcher.gentoo.org
1 jlec 11/02/23 07:32:08
2
3 Added: 1.0-gentoo.patch
4 Log:
5 Respect LDFLAGS, #335339
6
7 (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-calculators/hcalc/files/1.0-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hcalc/files/1.0-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hcalc/files/1.0-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: 1.0-gentoo.patch
16 ===================================================================
17 diff --git a/Makefile b/Makefile
18 index 5386821..eb5db3e 100644
19 --- a/Makefile
20 +++ b/Makefile
21 @@ -1,5 +1,5 @@
22 -CC = gcc
23 -CFLAGS = -g -O2 -MMD
24 +CC ?= gcc
25 +CFLAGS += -MMD
26
27 OBJS = \
28 hcalc.o \
29 @@ -10,7 +10,7 @@ OBJS = \
30 $E
31
32 hcalc : $(OBJS)
33 - gcc -o $@ $^ -L/usr/X11R6/lib -lXpm -lX11
34 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lXpm -lX11
35
36 clean :
37 -rm -f *.o *.d *~ \#* hcalc core
38 diff --git a/draw.c b/draw.c
39 index 5bde83d..c3bdeb2 100644
40 --- a/draw.c
41 +++ b/draw.c
42 @@ -3,6 +3,7 @@
43 http://www.delorie.com/store/hcalc/
44 */
45 #include "hcalc.h"
46 +#include <string.h>
47
48 static char shown_offsets[15];
49 static int shown_bitmask;
50 diff --git a/input.c b/input.c
51 index d7de47c..f1d45f5 100644
52 --- a/input.c
53 +++ b/input.c
54 @@ -5,6 +5,7 @@
55 #include "hcalc.h"
56 #include <ctype.h>
57 #include <string.h>
58 +#include <stdlib.h>
59
60 char pending_op = 0;
61 int making_number = 0;
62 diff --git a/setupx.c b/setupx.c
63 index 238c1e2..74e574b 100644
64 --- a/setupx.c
65 +++ b/setupx.c
66 @@ -3,6 +3,7 @@
67 http://www.delorie.com/store/hcalc/
68 */
69 #include "hcalc.h"
70 +#include <stdlib.h>
71
72 Display *display=0;
73 int screen=0;