From d4ca83e02422fa7c7c69ca57de599b6ee6ab235e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 1 Jun 2013 16:00:11 +0200 Subject: [PATCH] dbus-glib: build as static library Signed-off-by: Stephan Raue --- packages/devel/dbus-glib/build | 4 ++-- packages/devel/dbus-glib/install | 26 ------------------------- packages/python/system/dbus-python/meta | 2 +- packages/sysutils/ConsoleKit/meta | 2 +- packages/sysutils/remote/xwiimote/meta | 2 +- packages/sysutils/udisks/meta | 2 +- packages/sysutils/upower/meta | 2 +- 7 files changed, 7 insertions(+), 33 deletions(-) delete mode 100755 packages/devel/dbus-glib/install diff --git a/packages/devel/dbus-glib/build b/packages/devel/dbus-glib/build index 30ecb0a8d1..55138e78b7 100755 --- a/packages/devel/dbus-glib/build +++ b/packages/devel/dbus-glib/build @@ -35,8 +35,8 @@ mkdir -p .build-target && cd .build-target --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --enable-shared \ + --enable-static \ + --disable-shared \ --disable-tests \ --enable-asserts=no \ --with-introspect-xml="$ROOT/$DBUS_DIR/.build-host/introspect.xml" \ diff --git a/packages/devel/dbus-glib/install b/packages/devel/dbus-glib/install deleted file mode 100755 index 08292931a0..0000000000 --- a/packages/devel/dbus-glib/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/dbus/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/python/system/dbus-python/meta b/packages/python/system/dbus-python/meta index 343f966ddb..83a5365945 100644 --- a/packages/python/system/dbus-python/meta +++ b/packages/python/system/dbus-python/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/dbus" PKG_URL="http://dbus.freedesktop.org/releases/dbus-python/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python dbus dbus-glib" +PKG_DEPENDS="Python dbus" PKG_BUILD_DEPENDS="toolchain Python dbus dbus-glib" PKG_PRIORITY="optional" PKG_SECTION="python/system" diff --git a/packages/sysutils/ConsoleKit/meta b/packages/sysutils/ConsoleKit/meta index cde0ced57c..e7cc97427b 100644 --- a/packages/sysutils/ConsoleKit/meta +++ b/packages/sysutils/ConsoleKit/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/ConsoleKit" PKG_URL="http://www.freedesktop.org/software/ConsoleKit/dist/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="dbus dbus-glib polkit libX11" +PKG_DEPENDS="dbus polkit libX11" PKG_BUILD_DEPENDS="toolchain dbus dbus-glib polkit libX11" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/sysutils/remote/xwiimote/meta b/packages/sysutils/remote/xwiimote/meta index 0b92764cea..5d16eebbbd 100644 --- a/packages/sysutils/remote/xwiimote/meta +++ b/packages/sysutils/remote/xwiimote/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/dvdhrm/xwiimote" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="dbus-glib systemd bluez" +PKG_DEPENDS="systemd bluez" PKG_BUILD_DEPENDS="toolchain dbus-glib systemd bluez" PKG_PRIORITY="optional" PKG_SECTION="sysutils/remote" diff --git a/packages/sysutils/udisks/meta b/packages/sysutils/udisks/meta index 42ee94f5e5..1bfa6f6bb0 100644 --- a/packages/sysutils/udisks/meta +++ b/packages/sysutils/udisks/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/udisks" PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="systemd glib dbus dbus-glib parted polkit libatasmart" +PKG_DEPENDS="systemd glib dbus parted polkit libatasmart" PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted polkit libatasmart" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta index ba23415b9e..02d091a43c 100644 --- a/packages/sysutils/upower/meta +++ b/packages/sysutils/upower/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://upower.freedesktop.org/" PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils libusb" +PKG_DEPENDS="systemd glib dbus polkit pm-utils libusb" PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib polkit libusb" PKG_PRIORITY="optional" PKG_SECTION="system"