diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 2fb4b5a9c5..8046e62b94 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 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 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" diff --git a/packages/network/libssh/build b/packages/network/libssh/build index 4ed56cf638..a3d1a40ea3 100755 --- a/packages/network/libssh/build +++ b/packages/network/libssh/build @@ -27,9 +27,24 @@ mkdir -p build && cd build cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_GCRYPT="ON" \ + -DWITH_STATIC_LIB=1 -DWITH_GCRYPT="ON" \ .. make -$MAKEINSTALL +# install static library only + mkdir -p $SYSROOT_PREFIX/usr/lib + cp src/libssh.a $SYSROOT_PREFIX/usr/lib + cp src/threads/libssh_threads.a $SYSROOT_PREFIX/usr/lib + + mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig + cp libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + cp libssh_threads.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + + mkdir -p $SYSROOT_PREFIX/usr/include + cp ../include/libssh/callbacks.h $SYSROOT_PREFIX/usr/include + cp ../include/libssh/legacy.h $SYSROOT_PREFIX/usr/include + cp ../include/libssh/libssh.h $SYSROOT_PREFIX/usr/include + cp ../include/libssh/server.h $SYSROOT_PREFIX/usr/include + cp ../include/libssh/sftp.h $SYSROOT_PREFIX/usr/include + cp ../include/libssh/ssh2.h $SYSROOT_PREFIX/usr/include diff --git a/packages/network/libssh/install b/packages/network/libssh/install deleted file mode 100755 index 38784f3da3..0000000000 --- a/packages/network/libssh/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/src/*.so* $INSTALL/usr/lib