From 15c905c270533b5e2313b4ee25b9935604018fc2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 25 Aug 2008 15:05:03 +0000
Subject: 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
---
 meta/packages/insserv/files/crosscompile_fix.patch | 22 ++++++++++++++++++++++
 meta/packages/insserv/insserv_1.11.0.bb            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 meta/packages/insserv/files/crosscompile_fix.patch

(limited to 'meta')

diff --git a/meta/packages/insserv/files/crosscompile_fix.patch b/meta/packages/insserv/files/crosscompile_fix.patch
new file mode 100644
index 000000000..14d8db468
--- /dev/null
+++ b/meta/packages/insserv/files/crosscompile_fix.patch
@@ -0,0 +1,22 @@
+Index: insserv-1.11.0/Makefile
+===================================================================
+--- insserv-1.11.0.orig/Makefile	2008-08-25 16:00:00.000000000 +0100
++++ insserv-1.11.0/Makefile	2008-08-25 16:00:25.000000000 +0100
+@@ -18,16 +18,7 @@
+ #
+ # Architecture
+ #
+-ifdef RPM_OPT_FLAGS
+-	  COPTS = -g $(RPM_OPT_FLAGS)
+-else
+-	   ARCH = $(shell uname -i)
+-ifeq ($(ARCH),i386)
+-	  COPTS = -O2 -mcpu=i586 -mtune=i686
+-else
+-	  COPTS = -O2
+-endif
+-endif
++COPTS = -O2
+ COPTS += -g
+ 
+ 	 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 e567401f3..b5938b25b 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/packages/insserv/insserv_1.11.0.bb
@@ -1,10 +1,12 @@
 LICENSE = "GPL"
 SECTION = "base"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${PN}-${PV}.tar.gz \
         file://40_segfault_virtprov.dpatch;patch=1 \
         file://42_loopnochangemsg.dpatch;patch=1 \
         file://make.patch;patch=1 \
+        file://crosscompile_fix.patch;patch=1 \
         file://insserv.conf"
 
 do_install () {
-- 
cgit v1.2.3