From 148fb46640ae628de33733019026c44d2eb127cd Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 14 Dec 2013 20:35:24 +0200 Subject: [PATCH] libxml2: convert to new package format --- packages/devel/glib/package.mk | 2 +- packages/graphics/Mesa/package.mk | 2 +- packages/textproc/libxml2-host/build | 43 ---------------- packages/textproc/libxml2-host/meta | 36 -------------- packages/textproc/libxml2/build | 49 ------------------- packages/textproc/libxml2/install | 26 ---------- .../textproc/libxml2/{meta => package.mk} | 28 ++++++++++- 7 files changed, 29 insertions(+), 157 deletions(-) delete mode 100755 packages/textproc/libxml2-host/build delete mode 100644 packages/textproc/libxml2-host/meta delete mode 100755 packages/textproc/libxml2/build delete mode 100755 packages/textproc/libxml2/install rename packages/textproc/libxml2/{meta => package.mk} (67%) diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 77af5b7859..89eea68936 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -26,7 +26,7 @@ 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 libffi" -PKG_BUILD_DEPENDS_HOST="ccache libffi:host libxml2-host zlib:host Python-host" +PKG_BUILD_DEPENDS_HOST="ccache libffi:host libxml2:host zlib:host Python-host" PKG_BUILD_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python-host" PKG_PRIORITY="optional" PKG_SECTION="devel" diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk index c9138ee8fa..c16b4caa30 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/Mesa/package.mk @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2" PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11" -PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" +PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API" diff --git a/packages/textproc/libxml2-host/build b/packages/textproc/libxml2-host/build deleted file mode 100755 index 42142ff23f..0000000000 --- a/packages/textproc/libxml2-host/build +++ /dev/null @@ -1,43 +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 libxml2 - -setup_toolchain host - -cd $BUILD/libxml2-* - -do_autoreconf -mkdir -p .build-host && cd .build-host -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --disable-silent-rules \ - --disable-ipv6 \ - --with-python \ - --with-zlib \ - --without-lzma - -make -make install diff --git a/packages/textproc/libxml2-host/meta b/packages/textproc/libxml2-host/meta deleted file mode 100644 index 48d1764c2f..0000000000 --- a/packages/textproc/libxml2-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="libxml2-host" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="MIT" -PKG_SITE="http://xmlsoft.org" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain zlib:host Python-host" -PKG_PRIORITY="optional" -PKG_SECTION="textproc" -PKG_SHORTDESC="libxml: XML parser library for Gnome" -PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files. XML (eXtensible Markup Language) is a data format for structured document interchange via the Web." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build deleted file mode 100755 index 98df5f1c63..0000000000 --- a/packages/textproc/libxml2/build +++ /dev/null @@ -1,49 +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 - -cd $PKG_BUILD -mkdir -p .build-target - -cd .build-target -../configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-static \ - --enable-shared \ - --disable-silent-rules \ - --enable-ipv6 \ - --without-python \ - --with-zlib \ - --with-sysroot=$SYSROOT_PREFIX \ - --without-lzma - -make - -$MAKEINSTALL - -$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ - $SYSROOT_PREFIX/usr/bin/xml2-config - -mv $SYSROOT_PREFIX/usr/bin/xml2-config $ROOT/$TOOLCHAIN/bin diff --git a/packages/textproc/libxml2/install b/packages/textproc/libxml2/install deleted file mode 100755 index 763f209fbb..0000000000 --- a/packages/textproc/libxml2/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/.libs/libxml2*.so* $INSTALL/usr/lib diff --git a/packages/textproc/libxml2/meta b/packages/textproc/libxml2/package.mk similarity index 67% rename from packages/textproc/libxml2/meta rename to packages/textproc/libxml2/package.mk index b3a93350cd..60ff3f0a71 100644 --- a/packages/textproc/libxml2/meta +++ b/packages/textproc/libxml2/package.mk @@ -26,7 +26,7 @@ PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="zlib" -PKG_BUILD_DEPENDS="toolchain zlib" +PKG_BUILD_DEPENDS_TARGET="toolchain zlib" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="libxml: XML parser library for Gnome" @@ -34,3 +34,29 @@ PKG_LONGDESC="The libxml package contains an XML library, which allows you to ma PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_HOST="--prefix=$ROOT/$TOOLCHAIN \ + --disable-silent-rules \ + --disable-ipv6 \ + --with-python \ + --with-zlib \ + --without-lzma" + +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --enable-shared \ + --disable-silent-rules \ + --enable-ipv6 \ + --without-python \ + --with-zlib \ + --with-sysroot=$SYSROOT_PREFIX \ + --without-lzma" + +post_makeinstall_target() { + $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ + $SYSROOT_PREFIX/usr/bin/xml2-config + + mv $SYSROOT_PREFIX/usr/bin/xml2-config $ROOT/$TOOLCHAIN/bin + + rm -rf $INSTALL/usr/bin + rm -rf $INSTALL/usr/lib/xml2Conf.sh +}