summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-25 15:05:03 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-25 15:05:03 +0000
commit15c905c270533b5e2313b4ee25b9935604018fc2 (patch)
tree1ae5b9c0e05a33510f7ad208f39785bb5b56bc7b
parentaa7d993edb7c4d2ea83bff625f41b6fa15070e83 (diff)
downloadpoky-15c905c270533b5e2313b4ee25b9935604018fc2.tar.gz
insserv: Fix a cross compile issue on i386 machines
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5090 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/insserv/files/crosscompile_fix.patch22
-rw-r--r--meta/packages/insserv/insserv_1.11.0.bb2
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/packages/insserv/files/crosscompile_fix.patch b/meta/packages/insserv/files/crosscompile_fix.patch
new file mode 100644
index 0000000000..14d8db468f
--- /dev/null
+++ b/meta/packages/insserv/files/crosscompile_fix.patch
@@ -0,0 +1,22 @@
1Index: insserv-1.11.0/Makefile
2===================================================================
3--- insserv-1.11.0.orig/Makefile 2008-08-25 16:00:00.000000000 +0100
4+++ insserv-1.11.0/Makefile 2008-08-25 16:00:25.000000000 +0100
5@@ -18,16 +18,7 @@
6 #
7 # Architecture
8 #
9-ifdef RPM_OPT_FLAGS
10- COPTS = -g $(RPM_OPT_FLAGS)
11-else
12- ARCH = $(shell uname -i)
13-ifeq ($(ARCH),i386)
14- COPTS = -O2 -mcpu=i586 -mtune=i686
15-else
16- COPTS = -O2
17-endif
18-endif
19+COPTS = -O2
20 COPTS += -g
21
22 MY_CFLAGS = $(CFLAGS) -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/packages/insserv/insserv_1.11.0.bb
index e567401f37..b5938b25ba 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/packages/insserv/insserv_1.11.0.bb
@@ -1,10 +1,12 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2SECTION = "base" 2SECTION = "base"
3PR = "r1"
3 4
4SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${PN}-${PV}.tar.gz \ 5SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${PN}-${PV}.tar.gz \
5 file://40_segfault_virtprov.dpatch;patch=1 \ 6 file://40_segfault_virtprov.dpatch;patch=1 \
6 file://42_loopnochangemsg.dpatch;patch=1 \ 7 file://42_loopnochangemsg.dpatch;patch=1 \
7 file://make.patch;patch=1 \ 8 file://make.patch;patch=1 \
9 file://crosscompile_fix.patch;patch=1 \
8 file://insserv.conf" 10 file://insserv.conf"
9 11
10do_install () { 12do_install () {