From 545b7ce03cbc2b2b54e5bfbf1eb303902069e830 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 28 May 2013 16:14:00 +0200 Subject: [PATCH] pcre: build as static library Signed-off-by: Stephan Raue --- packages/devel/glib/meta | 2 +- packages/devel/pcre/build | 4 ++-- packages/devel/pcre/install | 27 --------------------------- packages/lang/php/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- 5 files changed, 5 insertions(+), 32 deletions(-) delete mode 100755 packages/devel/pcre/install diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index 44acd1be87..3b1cd256d6 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib $ICONV libffi pcre" +PKG_DEPENDS="zlib $ICONV libffi" PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host Python-host" PKG_PRIORITY="optional" PKG_SECTION="devel" diff --git a/packages/devel/pcre/build b/packages/devel/pcre/build index 2f8e81a0c1..f3d0c1a1ba 100755 --- a/packages/devel/pcre/build +++ b/packages/devel/pcre/build @@ -32,8 +32,8 @@ mkdir -p .build-target && cd .build-target --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ - --enable-shared \ - --disable-static \ + --disable-shared \ + --enable-static \ --enable-utf8 \ --enable-unicode-properties \ --with-gnu-ld diff --git a/packages/devel/pcre/install b/packages/devel/pcre/install deleted file mode 100755 index 3caea077bf..0000000000 --- a/packages/devel/pcre/install +++ /dev/null @@ -1,27 +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/libpcre*.so*[.0-9] $INSTALL/usr/lib - diff --git a/packages/lang/php/meta b/packages/lang/php/meta index e7e69ffd90..b6d317fad5 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 curl" PKG_BUILD_DEPENDS="toolchain zlib pcre sqlite curl" PKG_PRIORITY="optional" PKG_SECTION="web" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 03f15bacf7..17e3107806 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -30,7 +30,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 taglib yajl service.openelec.settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl service.openelec.settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite" PKG_PRIORITY="optional" PKG_SECTION="mediacenter"