From 83ce3c3ba074645f32b6239bd300153f7aa1fc74 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jun 2012 10:43:11 +0200 Subject: [PATCH] Revert "sqlite: build as static library" This reverts commit 84b26f9eba0e0b391b37055f4133c49766bee1e8. Conflicts: packages/3rdparty/multimedia/vdr-xmltv2vdr/meta packages/mediacenter/xbmc-frodo/meta packages/mediacenter/xbmc-pvr/meta packages/mediacenter/xbmc-rpi/meta packages/mediacenter/xbmc/meta --- .../3rdparty/multimedia/vdr-xmltv2vdr/meta | 2 +- packages/databases/sqlite/build | 6 +++-- packages/databases/sqlite/install | 26 +++++++++++++++++++ packages/lang/Python/meta | 2 +- packages/lang/php/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- 8 files changed, 36 insertions(+), 8 deletions(-) create mode 100755 packages/databases/sqlite/install diff --git a/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta b/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta index 82f224fb17..22b97d5889 100644 --- a/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta +++ b/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr" PKG_URL="http://projects.vdr-developer.org/attachments/download/946/${PKG_NAME}-${PKG_VERSION}.tgz" -PKG_DEPENDS="vdr curl libzip libxml libxslt" +PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt" PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build index a8dfefd446..d45c87797b 100755 --- a/packages/databases/sqlite/build +++ b/packages/databases/sqlite/build @@ -50,8 +50,8 @@ cd $PKG_BUILD --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-static \ - --disable-shared \ + --disable-static \ + --enable-shared \ --disable-readline \ --enable-threadsafe \ --enable-dynamic-extensions \ @@ -59,4 +59,6 @@ cd $PKG_BUILD make +$STRIP .libs/sqlite3 + $MAKEINSTALL diff --git a/packages/databases/sqlite/install b/packages/databases/sqlite/install new file mode 100755 index 0000000000..32163a5b62 --- /dev/null +++ b/packages/databases/sqlite/install @@ -0,0 +1,26 @@ +#!/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/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/lang/Python/meta b/packages/lang/Python/meta index 023031ae4a..0a10562956 100644 --- a/packages/lang/Python/meta +++ b/packages/lang/Python/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="expat zlib openssl libffi file" +PKG_DEPENDS="sqlite expat zlib openssl libffi file" PKG_BUILD_DEPENDS="toolchain Python-host sqlite expat zlib openssl libffi" PKG_PRIORITY="optional" PKG_SECTION="lang" diff --git a/packages/lang/php/meta b/packages/lang/php/meta index fa38e97baa..08670ef972 100644 --- a/packages/lang/php/meta +++ b/packages/lang/php/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OpenSource" PKG_SITE="http://www.php.net" PKG_URL="http://www.php.net/distributions/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib pcre curl" +PKG_DEPENDS="zlib pcre sqlite curl" PKG_BUILD_DEPENDS="toolchain zlib pcre sqlite curl" PKG_PRIORITY="optional" PKG_SECTION="web" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 528a90edd8..d9869dde9d 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -29,7 +29,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index c955266e69..f8bdd4b06c 100644 --- a/packages/mediacenter/xbmc-rpi/meta +++ b/packages/mediacenter/xbmc-rpi/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 9e99f813fb..704dd93f53 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -29,7 +29,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg alsa-lib libass curl libssh rtmpdump fontconfig freetype libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg alsa-lib libass curl libssh rtmpdump fontconfig freetype libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite alsa bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre alsa-lib ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter"