From 777a233ccb17481e5a077fa0a2c943375c571809 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 14 Dec 2013 17:37:01 +0200 Subject: [PATCH] pcre: convert to new package format --- .../3rdparty/multimedia/vdr-live/package.mk | 2 +- packages/devel/pcre-host/build | 42 ----------------- packages/devel/pcre-host/meta | 36 -------------- packages/devel/pcre/build | 47 ------------------- packages/devel/pcre/{meta => package.mk} | 24 +++++++++- packages/toolchain/devel/swig/meta | 2 +- 6 files changed, 25 insertions(+), 128 deletions(-) delete mode 100755 packages/devel/pcre-host/build delete mode 100644 packages/devel/pcre-host/meta delete mode 100755 packages/devel/pcre/build rename packages/devel/pcre/{meta => package.mk} (76%) diff --git a/packages/3rdparty/multimedia/vdr-live/package.mk b/packages/3rdparty/multimedia/vdr-live/package.mk index a2fdc7de46..9976fa566e 100644 --- a/packages/3rdparty/multimedia/vdr-live/package.mk +++ b/packages/3rdparty/multimedia/vdr-live/package.mk @@ -27,7 +27,7 @@ PKG_SITE="http://live.vdr-developer.org/en/index.php" PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_SOURCE_DIR="live-${PKG_VERSION}" PKG_DEPENDS="" -PKG_BUILD_DEPENDS_TARGET="toolchain vdr tntnet pcre-host pcre" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/" diff --git a/packages/devel/pcre-host/build b/packages/devel/pcre-host/build deleted file mode 100755 index 455d1aef9c..0000000000 --- a/packages/devel/pcre-host/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 - -$SCRIPTS/unpack pcre - -setup_toolchain host - -cd $BUILD/pcre-* -mkdir -p m4 && do_autoreconf - -mkdir -p .build-host && cd .build-host - -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --enable-utf8 \ - --enable-unicode-properties \ - --with-gnu-ld - -make -make install \ No newline at end of file diff --git a/packages/devel/pcre-host/meta b/packages/devel/pcre-host/meta deleted file mode 100644 index cb137aa383..0000000000 --- a/packages/devel/pcre-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="pcre-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.pcre.org/" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="devel" -PKG_SHORTDESC="pcre: Perl Compatible Regulat Expressions" -PKG_LONGDESC="The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. PCRE has its own native API, as well as a set of wrapper functions that correspond to the POSIX regular expression API. The PCRE library is free, even for building commercial software." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/devel/pcre/build b/packages/devel/pcre/build deleted file mode 100755 index fa99940c24..0000000000 --- a/packages/devel/pcre/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 - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD -mkdir -p m4 && do_autoreconf - -mkdir -p .build-target && cd .build-target -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --disable-shared \ - --enable-static \ - --enable-utf8 \ - --enable-unicode-properties \ - --with-gnu-ld - -make - -$MAKEINSTALL diff --git a/packages/devel/pcre/meta b/packages/devel/pcre/package.mk similarity index 76% rename from packages/devel/pcre/meta rename to packages/devel/pcre/package.mk index 3d87846ecd..04c6e39615 100644 --- a/packages/devel/pcre/meta +++ b/packages/devel/pcre/package.mk @@ -26,7 +26,8 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.pcre.org/" PKG_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_HOST="toolchain" +PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="pcre: Perl Compatible Regulat Expressions" @@ -34,3 +35,24 @@ PKG_LONGDESC="The PCRE library is a set of functions that implement regular expr PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_CONFIGURE_OPTS_HOST="--prefix=$ROOT/$TOOLCHAIN \ + --enable-utf8 \ + --enable-unicode-properties \ + --with-gnu-ld" + +PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ + --enable-static \ + --enable-utf8 \ + --enable-unicode-properties \ + --with-gnu-ld" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : +} diff --git a/packages/toolchain/devel/swig/meta b/packages/toolchain/devel/swig/meta index c3507b837a..103095fd0c 100644 --- a/packages/toolchain/devel/swig/meta +++ b/packages/toolchain/devel/swig/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.swig.org" PKG_URL="$SOURCEFORGE_SRC/swig/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache pcre-host" +PKG_BUILD_DEPENDS="ccache pcre:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="SWIG: a software development tool that connects programs written in C and C++ with a variety of high-level programming languages."