From 0068eb0e4dd657898bccb789d6dd9cfa6486675b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 9 Jun 2013 15:41:12 +0300 Subject: [PATCH] Revert "nettle: build as static library" This reverts commit 4fbda399db78166ffccaf654aa465a5e3f02bc47. Conflicts: packages/security/gnutls/meta --- packages/security/gnutls/meta | 2 +- packages/security/nettle/build | 2 +- packages/security/nettle/install | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100755 packages/security/nettle/install diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta index 584ac506a7..03b1083016 100644 --- a/packages/security/gnutls/meta +++ b/packages/security/gnutls/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.gnutls.org/" PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib" +PKG_DEPENDS="zlib nettle" PKG_BUILD_DEPENDS="toolchain zlib nettle" PKG_PRIORITY="optional" PKG_SECTION="security" diff --git a/packages/security/nettle/build b/packages/security/nettle/build index df2ad7b8f6..384a2a4a25 100755 --- a/packages/security/nettle/build +++ b/packages/security/nettle/build @@ -32,7 +32,7 @@ cd $PKG_BUILD --sysconfdir=/etc \ --localstatedir=/var \ --enable-static \ - --disable-shared \ + --enable-shared \ --disable-openssl \ --with-gnu-ld diff --git a/packages/security/nettle/install b/packages/security/nettle/install new file mode 100755 index 0000000000..1f302b928e --- /dev/null +++ b/packages/security/nettle/install @@ -0,0 +1,29 @@ +#!/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/libnettle.so $INSTALL/usr/lib + ln -sf libnettle.so $INSTALL/usr/lib/`basename $PKG_BUILD/.lib/libnettle.so.[0-9]` + cp -P $PKG_BUILD/libhogweed.so $INSTALL/usr/lib + ln -sf libhogweed.so $INSTALL/usr/lib/`basename $PKG_BUILD/.lib/libhogweed.so.[0-9]`