Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-block/smp_utils/files: smp_utils-0.96-make.patch
Date: Tue, 30 Aug 2011 09:32:08
Message-Id: 20110830093155.0375F20051@flycatcher.gentoo.org
1 radhermit 11/08/30 09:31:55
2
3 Added: smp_utils-0.96-make.patch
4 Log:
5 Version bump. Respect LDFLAGS (bug #334759) and update to EAPI 4.
6
7 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-block/smp_utils/files/smp_utils-0.96-make.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/smp_utils/files/smp_utils-0.96-make.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/smp_utils/files/smp_utils-0.96-make.patch?rev=1.1&content-type=text/plain
14
15 Index: smp_utils-0.96-make.patch
16 ===================================================================
17 --- smp_utils-0.96.orig/Makefile
18 +++ smp_utils-0.96/Makefile
19 @@ -39,15 +39,11 @@
20
21 INCLUDES = -I include
22
23 -# may be overridden by 'make -e'
24 -CFLAGS = -g -O2
25 -
26 MY_CFLAGS = -Wall -W $(EXTRA_FLAGS)
27 # MY_CFLAGS = -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
28
29 CFLAGS_PTHREADS = -D_REENTRANT
30
31 -LDFLAGS =
32 # LDFLAGS = -v -lm
33
34 # $(SDIRS):
35 @@ -65,8 +61,8 @@
36 sub_sgv4:
37 cd sgv4 && $(MAKE)
38
39 -libsmp.a : sub_mpt sub_sgv4 smp_lib.o smp_interface_sel.o
40 - ar r libsmp.a smp_lib.o smp_interface_sel.o mpt/smp_mptctl_io.o \
41 +libsmp.a: sub_mpt sub_sgv4 smp_lib.o smp_interface_sel.o
42 + $(AR) $(ARFLAGS) libsmp.a smp_lib.o smp_interface_sel.o mpt/smp_mptctl_io.o \
43 sgv4/smp_sgv4_io.o
44
45 depend dep:
46 @@ -167,15 +163,14 @@
47 smp_rep_self_conf_stat: smp_rep_self_conf_stat.o libsmp.a
48 $(LD) -o $@ $(LDFLAGS) $^
49
50 -install: $(EXECS)
51 +install:
52 install -d $(INSTDIR)
53 - for name in $^; \
54 + for name in $(EXECS); \
55 do install -m 755 $$name $(INSTDIR); \
56 done
57 install -d $(MANDIR)/$(MAN_PREF)
58 for mp in $(MAN_PGS); \
59 do install -m 644 doc/$$mp $(MANDIR)/$(MAN_PREF); \
60 - gzip -9f $(MANDIR)/$(MAN_PREF)/$$mp; \
61 done
62
63 uninstall:
64 --- smp_utils-0.96.orig/mpt/Makefile
65 +++ smp_utils-0.96/mpt/Makefile
66 @@ -18,10 +18,9 @@
67 INCLUDES = -I ../include
68
69 # CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
70 -CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
71 +CFLAGS += -Wall -W $(EXTRA_FLAGS)
72 # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
73
74 -LDFLAGS =
75 # LDFLAGS = -v -lm
76
77 .c.o:
78 --- smp_utils-0.96.orig/sgv4/Makefile
79 +++ smp_utils-0.96/sgv4/Makefile
80 @@ -21,10 +21,9 @@
81 # INCLUDES = -I ../include -idirafter ../include/dummy
82
83 # CFLAGS = -O2 -Wall -W $(EXTRA_FLAGS)
84 -CFLAGS = -g -O2 -Wall -W $(EXTRA_FLAGS)
85 +CFLAGS += -Wall -W $(EXTRA_FLAGS)
86 # CFLAGS = -O2 -Wall -W -pedantic -std=c99 $(EXTRA_FLAGS)
87
88 -LDFLAGS =
89 # LDFLAGS = -v -lm
90
91 .c.o: