From 82b736eef42e6d23f1fe6c76e0d84d9d21ea6a5b Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 2 Jan 2011 22:02:39 +0000
Subject: Move OSLib build to the arm-unknown-riscos toolchain Add CCRes to the
 toolchain

svn path=/toolchains/; revision=11183
---
 arm-unknown-riscos/Makefile | 49 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

(limited to 'arm-unknown-riscos/Makefile')

diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 464bf65..0a38ad1 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -3,24 +3,58 @@ UPSTREAM_GCCSDK_VERSION := 4957
 UPSTREAM_GCCSDK_TARBALL := gcc4
 UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4@$(UPSTREAM_GCCSDK_VERSION)
 
+# Ditto for OSLib
+UPSTREAM_OSLIB_VERSION := 402
+UPSTREAM_OSLIB_TARBALL := oslib
+UPSTREAM_OSLIB_URI := https://ro-oslib.svn.sourceforge.net/svnroot/ro-oslib/trunk/!OSLib@$(UPSTREAM_OSLIB_VERSION)
+
+# Ditto for CCRes
+UPSTREAM_CCRES_VERSION := 96
+UPSTREAM_CCRES_TARBALL := ccres
+UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION)
+
 TOP := $(CURDIR)
 RECIPES := $(TOP)/recipes
+BUILDSTEPS := $(TOP)/build-steps
 
 TARGET_NAME := arm-unknown-riscos
 
 PREFIX ?= /opt/netsurf/$(TARGET_NAME)
 
 .PHONY: all clean distclean
-all: $(UPSTREAM_GCCSDK_TARBALL)
-	cp -p $(RECIPES)/files/gcc4/gccsdk-params gcc4/gccsdk-params
-	sed -i 's#{PREFIX}#$(PREFIX)#' gcc4/gccsdk-params
-	cd gcc4 && make
+all: $(BUILDSTEPS)/buildsteps.d $(BUILDSTEPS)/gcc.d $(BUILDSTEPS)/oslib.d $(BUILDSTEPS)/ccres.d
 
 clean:
 	cd gcc4 && make clean
 
 distclean: clean
-	rm -fr gcc4
+	rm -fr $(UPSTREAM_GCCSDK_TARBALL)
+	rm -fr $(UPSTREAM_OSLIB_TARBALL)
+	rm -fr $(UPSTREAM_CCRES_TARBALL)
+	rm -fr $(BUILDSTEPS)
+
+# Buildsteps
+$(BUILDSTEPS)/buildsteps.d:
+	mkdir -p $(BUILDSTEPS)
+	touch $@
+
+# GCCSDK
+$(BUILDSTEPS)/gcc.d: $(UPSTREAM_GCC_TARBALL)
+	cp -p $(RECIPES)/files/gcc4/gccsdk-params gcc4/gccsdk-params
+	sed -i 's#{PREFIX}#$(PREFIX)#' gcc4/gccsdk-params
+	cd gcc4 && make
+	touch $@
+
+# OSLib
+$(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/buildsteps.d $(BUILDSTEPS)/gcc.d $(UPSTREAM_OSLIB_TARBALL)
+	cd $(UPSTREAM_OSLIB_TARBALL) && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
+	touch $@
+
+# CCRes
+$(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/buildsteps.d $(BUILDSTEPS)/oslib.d $(UPSTREAM_CCRES_TARBALL)
+	cd $(UPSTREAM_CCRES_TARBALL) && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make
+	cd $(UPSTREAM_CCRES_TARBALL) && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
+	touch $@
 
 ###
 # Rules to fetch upstream sources
@@ -29,3 +63,8 @@ distclean: clean
 $(UPSTREAM_GCCSDK_TARBALL):
 	svn co $(UPSTREAM_GCCSDK_URI) $@
 
+$(UPSTREAM_OSLIB_TARBALL):
+	svn co $(UPSTREAM_OSLIB_URI) $@
+
+$(UPSTREAM_CCRES_TARBALL):
+	svn co $(UPSTREAM_CCRES_URI) $@
-- 
cgit v1.2.3