From 748fa24be498f1f1a4a974e547b888752774e045 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 11 Oct 2013 20:27:09 +0300 Subject: [PATCH] libffi: convert to new package format. --- packages/devel/glib-host/meta | 2 +- packages/devel/libffi/build | 42 ------------------- packages/devel/libffi/install | 26 ------------ packages/devel/libffi/{meta => package.mk} | 15 ++++++- packages/toolchain/devel/libffi-host/build | 48 ---------------------- packages/toolchain/devel/libffi-host/meta | 36 ---------------- 6 files changed, 15 insertions(+), 154 deletions(-) delete mode 100755 packages/devel/libffi/build delete mode 100755 packages/devel/libffi/install rename packages/devel/libffi/{meta => package.mk} (78%) delete mode 100755 packages/toolchain/devel/libffi-host/build delete mode 100644 packages/toolchain/devel/libffi-host/meta diff --git a/packages/devel/glib-host/meta b/packages/devel/glib-host/meta index 74c8c70cf1..2a698104e7 100644 --- a/packages/devel/glib-host/meta +++ b/packages/devel/glib-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache libffi-host libxml2-host zlib:host Python-host" +PKG_BUILD_DEPENDS="ccache libffi:host libxml2-host zlib:host Python-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib-host: C support library" diff --git a/packages/devel/libffi/build b/packages/devel/libffi/build deleted file mode 100755 index 0b8c7184c6..0000000000 --- a/packages/devel/libffi/build +++ /dev/null @@ -1,42 +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 -mkdir -p .build-target && cd .build-target -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --includedir=/usr/include \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --enable-structs \ - --enable-raw-api \ - --disable-purify-safety \ - --with-gnu-ld - -make - -$MAKEINSTALL diff --git a/packages/devel/libffi/install b/packages/devel/libffi/install deleted file mode 100755 index e7f7d53b26..0000000000 --- a/packages/devel/libffi/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/*.so* $INSTALL/usr/lib diff --git a/packages/devel/libffi/meta b/packages/devel/libffi/package.mk similarity index 78% rename from packages/devel/libffi/meta rename to packages/devel/libffi/package.mk index 50a026fe89..ae0e2c5371 100644 --- a/packages/devel/libffi/meta +++ b/packages/devel/libffi/package.mk @@ -26,7 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://sourceware.org/$PKG_NAME/" PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$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="devel" PKG_SHORTDESC="Foreign Function Interface Library" @@ -34,3 +35,15 @@ PKG_LONGDESC="The libffi library provides a portable, high level programming int PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_HOST="--disable-debug \ + --enable-structs \ + --enable-raw-api \ + --disable-purify-safety \ + --with-gnu-ld" + +PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ + --enable-structs \ + --enable-raw-api \ + --disable-purify-safety \ + --with-gnu-ld" diff --git a/packages/toolchain/devel/libffi-host/build b/packages/toolchain/devel/libffi-host/build deleted file mode 100755 index a3a920f8f9..0000000000 --- a/packages/toolchain/devel/libffi-host/build +++ /dev/null @@ -1,48 +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 libffi - -setup_toolchain host - -cd $BUILD/libffi-* - -do_autoreconf - -mkdir -p .build-host && cd .build-host -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --includedir=$ROOT/$TOOLCHAIN/include \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --enable-structs \ - --enable-raw-api \ - --disable-purify-safety \ - --with-gnu-ld - -make -make install diff --git a/packages/toolchain/devel/libffi-host/meta b/packages/toolchain/devel/libffi-host/meta deleted file mode 100644 index 3ca5490b3b..0000000000 --- a/packages/toolchain/devel/libffi-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="libffi-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://sourceware.org/$PKG_NAME/" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache autotools" -PKG_PRIORITY="optional" -PKG_SECTION="devel" -PKG_SHORTDESC="Foreign Function Interface Library" -PKG_LONGDESC="The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run-time." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no"