From fd5238e4c4131c24da9e7ed7eb6ca8de85cbb1f6 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 8 Jan 2014 23:13:57 +0100
Subject: [PATCH] nasm: convert to new package format, move package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../lang/nasm/meta => lang/nasm/package.mk}   | 14 ++++++---
 packages/toolchain/lang/nasm/build            | 31 -------------------
 packages/toolchain/meta                       |  2 +-
 3 files changed, 11 insertions(+), 36 deletions(-)
 rename packages/{toolchain/lang/nasm/meta => lang/nasm/package.mk} (90%)
 delete mode 100755 packages/toolchain/lang/nasm/build

diff --git a/packages/toolchain/lang/nasm/meta b/packages/lang/nasm/package.mk
similarity index 90%
rename from packages/toolchain/lang/nasm/meta
rename to packages/lang/nasm/package.mk
index 6d46edd616..1bb87fc46e 100644
--- a/packages/toolchain/lang/nasm/meta
+++ b/packages/lang/nasm/package.mk
@@ -23,12 +23,18 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://nasm.sourceforge.net/"
 PKG_URL="http://www.nasm.us/pub/nasm/releasebuilds/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/lang"
+PKG_SECTION="lang"
 PKG_SHORTDESC="nasm: A 80x86 assembler which can create a wide rande of object formats"
 PKG_LONGDESC="The Netwide Assembler, NASM, is an 80x86 assembler designed for portability and modularity. It supports a range of object file formats, including Linux, Microsoft 16-bit OBJ and Win32. It will also output plain binary files. Its syntax is designed to be sim- ple and easy to understand, similar to Intel's but less complex. It supports Pentium, P6 and MMX opcodes, and has macro capability. It includes a disassembler as well."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+pre_configure_host() {
+# nasm fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+    rm -rf .$HOST_NAME
+}
diff --git a/packages/toolchain/lang/nasm/build b/packages/toolchain/lang/nasm/build
deleted file mode 100755
index f79af04118..0000000000
--- a/packages/toolchain/lang/nasm/build
+++ /dev/null
@@ -1,31 +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
-
-setup_toolchain host
-
-cd $PKG_BUILD
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN
-
-make
-make install
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index dec1ecdbcf..3f972e32c3 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config:host autotools gcc:host bison:host flex:host cmake:host scons:host yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config:host autotools gcc:host bison:host flex:host cmake:host scons:host yasm nasm:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"