From 14451d6eb46c9d7e804214764e7f7c156f99f920 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 30 Apr 2011 22:59:32 +0200 Subject: [PATCH 1/2] curl: build against openssl, this fixes build on F15 Signed-off-by: Stephan Raue --- packages/web/curl/build | 6 ++++-- packages/web/curl/meta | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/web/curl/build b/packages/web/curl/build index 5d9ce6a2ab..d38aef2866 100755 --- a/packages/web/curl/build +++ b/packages/web/curl/build @@ -26,6 +26,8 @@ LDFLAGS="$LDFLAGS -lrt -lrtmp" cd $PKG_BUILD +ac_cv_lib_rtmp_RTMP_Init=yes \ +ac_cv_header_librtmp_rtmp_h=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -66,12 +68,12 @@ cd $PKG_BUILD --without-krb4 \ --without-spnego \ --without-gssapi \ - --without-ssl \ + --with-ssl \ --with-zlib \ --without-egd-socket \ --enable-thread \ --with-random=/dev/urandom \ - --with-gnutls="$SYSROOT_PREFIX/usr" \ + --without-gnutls \ --without-polarssl \ --without-nss \ --with-ca-bundle="/etc/ssl/certs/ca-bundle.crt" \ diff --git a/packages/web/curl/meta b/packages/web/curl/meta index 8bb13e8df2..f5b1061246 100644 --- a/packages/web/curl/meta +++ b/packages/web/curl/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://curl.haxx.se" PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib gnutls rtmpdump" -PKG_BUILD_DEPENDS="toolchain zlib gnutls rtmpdump" +PKG_DEPENDS="zlib openssl rtmpdump" +PKG_BUILD_DEPENDS="toolchain zlib openssl rtmpdump" PKG_PRIORITY="optional" PKG_SECTION="web" PKG_SHORTDESC="curl: Client and library for (HTTP, HTTPS, FTP, ...) transfers" From 33479afe3e7ea29f3151fc818fdbf824272c3032 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 30 Apr 2011 23:01:46 +0200 Subject: [PATCH 2/2] scripts/checkdeps: remove check for perl-XML-Parser Signed-off-by: Stephan Raue --- scripts/checkdeps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 0ae4cf54c2..9ed5c8b0bd 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -35,8 +35,8 @@ case $1 in build) deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt" deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext" - files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h /usr/lib/perl5/XML/Parser.pm" - files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev perl-XML-Parser" + files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h" + files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev" ;; qemu) if [ ! `which qemu` ]; then