diff options
author | Scott Garman <scott.a.garman@intel.com> | 2010-11-28 20:46:27 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:19 +0000 |
commit | 1f427822e3c34bf24fa4b4a511c30c0f6d72774e (patch) | |
tree | 7b71db6e550953356e1ce300f1c81c84c418792d /meta/recipes-devtools/insserv/files/makefile.patch | |
parent | 9aef79e3a0bde4e4266b357652386ee1b4873260 (diff) | |
download | poky-1f427822e3c34bf24fa4b4a511c30c0f6d72774e.tar.gz |
insserv: upgrade to version 1.14.0
* Removed obsolete patches
* Disabled make check tests which cannot be run when cross-compiled
* Added SUMMARY, DESCRIPTION, and PRIORITY fields
* Added source checksums
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools/insserv/files/makefile.patch')
-rw-r--r-- | meta/recipes-devtools/insserv/files/makefile.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-devtools/insserv/files/makefile.patch b/meta/recipes-devtools/insserv/files/makefile.patch new file mode 100644 index 0000000000..19e99c6324 --- /dev/null +++ b/meta/recipes-devtools/insserv/files/makefile.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | # Enable debug options and modify the use of CLFAGS (carried over | ||
2 | # from the previous version's patch). | ||
3 | # | ||
4 | # Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
5 | diff -urN insserv-1.14.0.orig//Makefile insserv-1.14.0//Makefile | ||
6 | --- insserv-1.14.0.orig//Makefile 2010-04-29 03:33:40.000000000 -0700 | ||
7 | +++ insserv-1.14.0//Makefile 2010-11-28 17:09:20.537996190 -0800 | ||
8 | @@ -8,27 +8,16 @@ | ||
9 | INITDIR = /etc/init.d | ||
10 | INSCONF = /etc/insserv.conf | ||
11 | #DESTDIR = /tmp/root | ||
12 | -#DEBUG = -DDEBUG=1 -Wpacked | ||
13 | +DEBUG = -DDEBUG=1 -Wpacked | ||
14 | DEBUG = | ||
15 | -ISSUSE = -DSUSE | ||
16 | +#ISSUSE = -DSUSE | ||
17 | DESTDIR = | ||
18 | VERSION = 1.14.0 | ||
19 | DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') | ||
20 | |||
21 | -# | ||
22 | -# Architecture | ||
23 | -# | ||
24 | -ifdef RPM_OPT_FLAGS | ||
25 | - COPTS = -g $(RPM_OPT_FLAGS) | ||
26 | -else | ||
27 | - ARCH = $(shell uname -i) | ||
28 | -ifeq ($(ARCH),i386) | ||
29 | - COPTS = -g -O3 -mcpu=i586 -mtune=i686 | ||
30 | -else | ||
31 | - COPTS = -g -O2 | ||
32 | -endif | ||
33 | -endif | ||
34 | - CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ | ||
35 | +COPTS = -O2 -g | ||
36 | + | ||
37 | + MY_CFLAGS = $(CFLAGS) -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ | ||
38 | $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe | ||
39 | CLOOP = -falign-loops=0 | ||
40 | LDFLAGS = -Wl,-O,3,--relax | ||
41 | @@ -75,13 +64,13 @@ | ||
42 | all: $(TODO) | ||
43 | |||
44 | insserv: insserv.o listing.o | ||
45 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
46 | + $(CC) $(MY_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) | ||
47 | |||
48 | listing.o: listing.c listing.h config.h .system | ||
49 | - $(CC) $(CFLAGS) $(CLOOP) -c $< | ||
50 | + $(CC) $(MY_CFLAGS) $(CLOOP) -c $< | ||
51 | |||
52 | insserv.o: insserv.c listing.h config.h .system | ||
53 | - $(CC) $(CFLAGS) $(CLOOP) -c $< | ||
54 | + $(CC) $(MY_CFLAGS) $(CLOOP) -c $< | ||
55 | |||
56 | listing.h: .system | ||
57 | |||
58 | @@ -119,10 +108,10 @@ | ||
59 | -include .depend.listing .depend.insserv | ||
60 | |||
61 | .depend.listing:: listing.c listing.h | ||
62 | - @$(CC) $(CFLAGS) -M listing.c >$@ 2>/dev/null | ||
63 | + @$(CC) $(MY_CFLAGS) -M listing.c >$@ 2>/dev/null | ||
64 | |||
65 | .depend.insserv:: insserv.c listing.h | ||
66 | - @$(CC) $(CFLAGS) -M insserv.c >$@ 2>/dev/null | ||
67 | + @$(CC) $(MY_CFLAGS) -M insserv.c >$@ 2>/dev/null | ||
68 | |||
69 | endif | ||
70 | |||