From 274792fe791315e0564d74bcfaff6ddfaafd0772 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Jul 2013 23:35:18 +0200 Subject: [PATCH] expat: convert to new package format Signed-off-by: Stephan Raue --- packages/sysutils/dbus-host/meta | 2 +- packages/textproc/expat-host/build | 40 -------------------- packages/textproc/expat-host/meta | 36 ------------------ packages/textproc/expat/build | 40 -------------------- packages/textproc/expat/install | 26 ------------- packages/textproc/expat/{meta => package.mk} | 18 ++++++++- packages/toolchain/lang/Python-host/meta | 4 +- 7 files changed, 19 insertions(+), 147 deletions(-) delete mode 100755 packages/textproc/expat-host/build delete mode 100644 packages/textproc/expat-host/meta delete mode 100755 packages/textproc/expat/build delete mode 100755 packages/textproc/expat/install rename packages/textproc/expat/{meta => package.mk} (86%) diff --git a/packages/sysutils/dbus-host/meta b/packages/sysutils/dbus-host/meta index f5e2351b6e..c2a814d55a 100644 --- a/packages/sysutils/dbus-host/meta +++ b/packages/sysutils/dbus-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://dbus.freedesktop.org" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain expat-host" +PKG_BUILD_DEPENDS="toolchain expat:host" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="dbus: simple interprocess messaging system" diff --git a/packages/textproc/expat-host/build b/packages/textproc/expat-host/build deleted file mode 100755 index 6a3a2409ee..0000000000 --- a/packages/textproc/expat-host/build +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -$SCRIPTS/unpack expat - -setup_toolchain host - -cd $BUILD/expat-* -do_autoreconf -I conftools - -mkdir -p .build-host && cd .build-host -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --enable-shared \ - --disable-static \ - -make -make install diff --git a/packages/textproc/expat-host/meta b/packages/textproc/expat-host/meta deleted file mode 100644 index 171fe85ac0..0000000000 --- a/packages/textproc/expat-host/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="expat-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://expat.sourceforge.net/" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache autotools" -PKG_PRIORITY="optional" -PKG_SECTION="textproc" -PKG_SHORTDESC="expat: XML parser library" -PKG_LONGDESC="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). An introductory article on using Expat is available on xml.com." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/textproc/expat/build b/packages/textproc/expat/build deleted file mode 100755 index 90008d376b..0000000000 --- a/packages/textproc/expat/build +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -do_autoreconf -I conftools - -mkdir -p .build-target && cd .build-target -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - -make - -$MAKEINSTALL diff --git a/packages/textproc/expat/install b/packages/textproc/expat/install deleted file mode 100755 index ef204fef08..0000000000 --- a/packages/textproc/expat/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/.build-target/.libs/libexpat.so* $INSTALL/usr/lib diff --git a/packages/textproc/expat/meta b/packages/textproc/expat/package.mk similarity index 86% rename from packages/textproc/expat/meta rename to packages/textproc/expat/package.mk index de94590b78..dbe33904c9 100644 --- a/packages/textproc/expat/meta +++ b/packages/textproc/expat/package.mk @@ -26,11 +26,25 @@ PKG_LICENSE="OSS" PKG_SITE="http://expat.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_HOST="ccache autotools" +PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="expat: XML parser library" PKG_LONGDESC="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). An introductory article on using Expat is available on xml.com." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +pre_configure_target() { + ( cd ..; do_autoreconf -I conftools) +} + +pre_configure_host() { + ( cd ..; do_autoreconf -I conftools) +} + +post_makeinstall_target() { + rm -rf $INSTALL/usr/bin +} + diff --git a/packages/toolchain/lang/Python-host/meta b/packages/toolchain/lang/Python-host/meta index 02ab8771ac..20e34a361c 100644 --- a/packages/toolchain/lang/Python-host/meta +++ b/packages/toolchain/lang/Python-host/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="" -PKG_DEPENDS="expat-host" -PKG_BUILD_DEPENDS="ccache zlib:host expat-host" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="ccache zlib:host expat:host" PKG_PRIORITY="optional" PKG_SECTION="lang" PKG_SHORTDESC="python: The Python programming language"