[oe-commits] org.oe.dev sdcc: add native-tools patch to make it build

[mickeyl commit]

sdcc: add native-tools patch to make it build

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6c3c55a664b5e9996db5827d3e56aea5673fa0f5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6c3c55a664b5e9996db5827d3e56aea5673fa0f5
Files:
1
packages/sdcc/files/use-native-tools.patch
packages/sdcc/sdcc-native_2.5.0.bb
packages/sdcc/sdcc_2.5.0.bb
Diffs:

#
# mt diff -rb1cace7bd8dc05cf34a5ca296aae672c7c4cbcd2 -r6c3c55a664b5e9996db5827d3e56aea5673fa0f5
#
# 
# 
# add_file "packages/sdcc/files/use-native-tools.patch"
#  content [24cec6bcdf880e9d2288a2a4f73b8ad1d1b75806]
# 
# patch "packages/sdcc/sdcc-native_2.5.0.bb"
#  from [dbbc60586012aa7c17e53b9c3705f02dbb957528]
#    to [933d2bd55af4d4af6cca17765390b06737a37341]
# 
# patch "packages/sdcc/sdcc_2.5.0.bb"
#  from [af4dfbd35c5ce503690ebd248b8d1f97b93c9813]
#    to [e491f16af6fbc4d083059205cbafececc2aa9d18]
# 
============================================================
--- packages/sdcc/files/use-native-tools.patch	24cec6bcdf880e9d2288a2a4f73b8ad1d1b75806
+++ packages/sdcc/files/use-native-tools.patch	24cec6bcdf880e9d2288a2a4f73b8ad1d1b75806
@@ -0,0 +1,80 @@
+Index: sdcc/device/lib/Makefile.in
+===================================================================
+--- sdcc.orig/device/lib/Makefile.in
++++ sdcc/device/lib/Makefile.in
+@@ -18,8 +18,8 @@ ifndef PORTINCDIR
+ PORTINCDIR	= $(INCDIR)/mcs51
+ endif
+ 
+-CC		= $(PRJDIR)/bin/sdcc
+-CPP		= $(PRJDIR)/bin/sdcpp
++CC		= sdcc
++CPP		= sdcpp
+ 
+ prefix          = @prefix@
+ exec_prefix     = @exec_prefix@
+Index: sdcc/device/lib/mcs51/Makefile
+===================================================================
+--- sdcc.orig/device/lib/mcs51/Makefile
++++ sdcc/device/lib/mcs51/Makefile
+@@ -1,8 +1,8 @@
+ 
+ TOPDIR = ../../..
+ 
+-SAS = $(TOPDIR)/bin/asx8051
+-SCC = $(TOPDIR)/bin/sdcc
++SAS = asx8051
++SCC = sdcc
+ 
+ OBJ = crtstart.rel crtxinit.rel crtxclear.rel crtclear.rel crtxstack.rel \
+       crtpagesfr.rel
+Index: sdcc/device/lib/ds390/Makefile
+===================================================================
+--- sdcc.orig/device/lib/ds390/Makefile
++++ sdcc/device/lib/ds390/Makefile
+@@ -1,4 +1,4 @@
+-CC = ../../../bin/sdcc
++CC = sdcc
+ 
+ #VERBOSE = --verbose
+ 
+Index: sdcc/device/lib/ds400/Makefile
+===================================================================
+--- sdcc.orig/device/lib/ds400/Makefile
++++ sdcc/device/lib/ds400/Makefile
+@@ -1,4 +1,4 @@
+-CC = ../../../bin/sdcc
++CC = sdcc
+ 
+ #VERBOSE = --verbose
+ 
+Index: sdcc/device/lib/z80/Makefile
+===================================================================
+--- sdcc.orig/device/lib/z80/Makefile
++++ sdcc/device/lib/z80/Makefile
+@@ -2,8 +2,8 @@
+ 
+ TOPDIR = ../../..
+ 
+-SCC = $(TOPDIR)/bin/sdcc -mz80
+-SAS = $(TOPDIR)/bin/as-z80
++SCC = sdcc -mz80
++SAS = as-z80
+ 
+ OBJ = div.o mul.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
+ 
+Index: sdcc/device/lib/gbz80/Makefile
+===================================================================
+--- sdcc.orig/device/lib/gbz80/Makefile
++++ sdcc/device/lib/gbz80/Makefile
+@@ -2,8 +2,8 @@
+ 
+ TOPDIR = ../../..
+ 
+-SCC = $(TOPDIR)/bin/sdcc -mgbz80
+-SAS = $(TOPDIR)/bin/as-gbz80
++SCC = sdcc -mgbz80
++SAS = as-gbz80
+ 
+ OBJ = div.o mul.o putchar.o printf.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
+ 
============================================================
--- packages/sdcc/sdcc-native_2.5.0.bb	dbbc60586012aa7c17e53b9c3705f02dbb957528
+++ packages/sdcc/sdcc-native_2.5.0.bb	933d2bd55af4d4af6cca17765390b06737a37341
@@ -1,10 +1,15 @@ require sdcc_${PV}.bb
 require sdcc_${PV}.bb
-
 inherit native
+DEPENDS = ""
 
-# yes, we usually don't want to do this in order to prevent staging pollution,
-# however sdcc behaves pretty nice here, so we can do an exception here (ML).
+# don't need native-tools patch here
+SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
+           file://gcc4.patch;patch=1"
+
 do_stage() {
-	oe_runmake install 
+	autotools_stage_all
+	for i in bin/as-*; do
+		install -m 0755 $i ${STAGING_BINDIR}
+	done
 }
 
============================================================
--- packages/sdcc/sdcc_2.5.0.bb	af4dfbd35c5ce503690ebd248b8d1f97b93c9813
+++ packages/sdcc/sdcc_2.5.0.bb	e491f16af6fbc4d083059205cbafececc2aa9d18
@@ -1,11 +1,13 @@ HOMEPAGE = "http://sdcc.sourceforge.net"
 DESCRIPTION= "SDCC - Small Device C Compiler"
 LICENSE = "GPL"
 SECTION = "devel"
 HOMEPAGE = "http://sdcc.sourceforge.net"
+DEPENDS = "sdcc-native"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
-           file://gcc4.patch;patch=1"
+           file://gcc4.patch;patch=1 \
+           file://use-native-tools.patch;patch=1"
 S = "${WORKDIR}/sdcc"
 
 PARALLEL_MAKE = ""