From 7731bd7305234b74280732115d562685f04dbd6e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 3 Jan 2014 15:26:57 +0100
Subject: [PATCH] darwin-cross: convert to new package format, move to
 'toolchain', handle as own toolchain

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../meta => darwin-cross/package.mk}          | 20 +++++++++-
 .../toolchain/toolchains/darwin-cross/unpack  | 37 -------------------
 packages/tools/atv-bootloader/package.mk      |  4 +-
 3 files changed, 21 insertions(+), 40 deletions(-)
 rename packages/toolchain/{toolchains/darwin-cross/meta => darwin-cross/package.mk} (80%)
 delete mode 100755 packages/toolchain/toolchains/darwin-cross/unpack

diff --git a/packages/toolchain/toolchains/darwin-cross/meta b/packages/toolchain/darwin-cross/package.mk
similarity index 80%
rename from packages/toolchain/toolchains/darwin-cross/meta
rename to packages/toolchain/darwin-cross/package.mk
index 6dd3672559..242f7c381f 100644
--- a/packages/toolchain/toolchains/darwin-cross/meta
+++ b/packages/toolchain/darwin-cross/package.mk
@@ -30,6 +30,24 @@ PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/toolchains"
 PKG_SHORTDESC="darwin-cross: darwin gcc etc"
 PKG_LONGDESC="This package contains the GNU Compiler Collection to build for darwin systems"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+post_unpack() {
+# extract toolchain
+  tar -xzf $PKG_BUILD/darwin-cross.tar.gz -C $TOOLCHAIN
+
+# fix 'as'
+  rm -rf $TOOLCHAIN/$PKG_NAME/i386-apple-darwin8/bin/as
+  ln -sf ../../libexec/10.4/as/i386/as $TOOLCHAIN/$PKG_NAME/i386-apple-darwin8/bin/as
+}
+
+make_target() {
+  : # nothing todo
+}
+
+makeinstall_target() {
+  : # nothing todo
+}
+
diff --git a/packages/toolchain/toolchains/darwin-cross/unpack b/packages/toolchain/toolchains/darwin-cross/unpack
deleted file mode 100755
index 2fe6e82c83..0000000000
--- a/packages/toolchain/toolchains/darwin-cross/unpack
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-
-. config/options $1
-
-# extract toolchain
-  tar -xzf $PKG_BUILD/darwin-cross.tar.gz -C $PKG_BUILD
-
-# move toolchain to a proper location
-  mv $PKG_BUILD/darwin-cross/* $PKG_BUILD
-
-# cleanup
-  rm -rf $PKG_BUILD/darwin-cross/
-  rm -rf $PKG_BUILD/darwin-cross.tar.gz
-  rm -rf $PKG_BUILD/install_darwin-cross.sh
-
-# fix 'as'
-  rm -rf $PKG_BUILD/i386-apple-darwin8/bin/as
-  ln -sf $ROOT/$PKG_BUILD/libexec/10.4/as/i386/as $PKG_BUILD/i386-apple-darwin8/bin/as
diff --git a/packages/tools/atv-bootloader/package.mk b/packages/tools/atv-bootloader/package.mk
index 7098d3352c..ce22c3223a 100644
--- a/packages/tools/atv-bootloader/package.mk
+++ b/packages/tools/atv-bootloader/package.mk
@@ -34,8 +34,8 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_MAKE_OPTS_TARGET="KERN_OBJ=vmlinuz.obj \
-                      CC=$ROOT/$BUILD/darwin-cross-1/bin/i386-apple-darwin8-gcc-4.0.1 \
-                      LD=$ROOT/$BUILD/darwin-cross-1/bin/i386-apple-darwin8-ld"
+                      CC=$ROOT/$TOOLCHAIN/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1 \
+                      LD=$ROOT/$TOOLCHAIN/darwin-cross/bin/i386-apple-darwin8-ld"
 
 pre_make_target() {
   unset LDFLAGS