From 12ed8fb4a194e893938d0d265ba7393149d2dc60 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 14 Dec 2013 16:36:46 +0100 Subject: [PATCH] dbus-glib: convert to new package format Signed-off-by: Stephan Raue --- packages/devel/dbus-glib-host/build | 45 ------------------ packages/devel/dbus-glib-host/meta | 36 -------------- packages/devel/dbus-glib/build | 47 ------------------- packages/devel/dbus-glib/{meta => package.mk} | 24 +++++++++- 4 files changed, 22 insertions(+), 130 deletions(-) delete mode 100755 packages/devel/dbus-glib-host/build delete mode 100644 packages/devel/dbus-glib-host/meta delete mode 100755 packages/devel/dbus-glib/build rename packages/devel/dbus-glib/{meta => package.mk} (63%) diff --git a/packages/devel/dbus-glib-host/build b/packages/devel/dbus-glib-host/build deleted file mode 100755 index 8bd392ac8b..0000000000 --- a/packages/devel/dbus-glib-host/build +++ /dev/null @@ -1,45 +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 dbus-glib - -DBUS_GLIB_DIR=`ls -d $BUILD/dbus-glib-[0-9]*` - -setup_toolchain host - -cd $DBUS_GLIB_DIR - -do_autoreconf -mkdir -p .build-host && cd .build-host -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --sysconfdir=$ROOT/$TOOLCHAIN/etc \ - --disable-tests \ - --disable-bash-completion \ - --disable-doxygen-docs \ - --enable-asserts=yes \ - -make -make install diff --git a/packages/devel/dbus-glib-host/meta b/packages/devel/dbus-glib-host/meta deleted file mode 100644 index 842c55bb0a..0000000000 --- a/packages/devel/dbus-glib-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="dbus-glib-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://freedesktop.org/wiki/Software/dbus" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain glib-host dbus:host" -PKG_PRIORITY="optional" -PKG_SECTION="devel" -PKG_SHORTDESC="dbus-glib: A message bus system" -PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/devel/dbus-glib/build b/packages/devel/dbus-glib/build deleted file mode 100755 index 55138e78b7..0000000000 --- a/packages/devel/dbus-glib/build +++ /dev/null @@ -1,47 +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 - -export ac_cv_have_abstract_sockets=yes -export ac_cv_func_posix_getpwnam_r=yes -export have_abstract_sockets=yes - -DBUS_DIR=`ls -d $BUILD/dbus-[0-9]*` - -cd $PKG_BUILD -mkdir -p .build-target && cd .build-target -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static \ - --disable-shared \ - --disable-tests \ - --enable-asserts=no \ - --with-introspect-xml="$ROOT/$DBUS_DIR/.build-host/introspect.xml" \ - --with-dbus-binding-tool="$ROOT/$TOOLCHAIN/bin/dbus-binding-tool" \ - -make - -$MAKEINSTALL diff --git a/packages/devel/dbus-glib/meta b/packages/devel/dbus-glib/package.mk similarity index 63% rename from packages/devel/dbus-glib/meta rename to packages/devel/dbus-glib/package.mk index e2267e142e..575e2eec0f 100644 --- a/packages/devel/dbus-glib/meta +++ b/packages/devel/dbus-glib/package.mk @@ -26,11 +26,31 @@ PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/dbus" PKG_URL="http://dbus.freedesktop.org/releases/dbus-glib/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="dbus glib expat" -PKG_BUILD_DEPENDS="toolchain dbus glib expat dbus-glib-host" +PKG_BUILD_DEPENDS_HOST="toolchain glib-host dbus:host" +PKG_BUILD_DEPENDS_TARGET="toolchain dbus glib expat dbus-glib:host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="dbus-glib: A message bus system" PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \ + ac_cv_func_posix_getpwnam_r=yes \ + have_abstract_sockets=yes \ + --enable-static \ + --disable-shared \ + --disable-tests \ + --disable-bash-completion \ + --enable-asserts=no \ + --with-introspect-xml=$PKG_BUILD/.$HOST_NAME/introspect.xml \ + --with-dbus-binding-tool=$ROOT/$TOOLCHAIN/bin/dbus-binding-tool" + +PKG_CONFIGURE_OPTS_HOST="--disable-tests \ + --disable-bash-completion \ + --enable-asserts=yes" + +post_makeinstall_target() { + rm -rf $INSTALL/usr/bin/dbus-binding-tool +}