merge of '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'

     and '43c8d115f4121fbba5fab40e9d00365636b9fb62'

diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index 555e5bc..ef85358 100644 (file)
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch;patch=1"

diff --git a/packages/curl/files/pkgconfig_fix.patch b/packages/curl/files/pkgconfig_fix.patch
index a573009..e02316a 100644 (file)
--- a/packages/curl/files/pkgconfig_fix.patch
+++ b/packages/curl/files/pkgconfig_fix.patch
@@ -1,14 +1,35 @@
 Index: curl-7.16.4/libcurl.pc.in
 ===================================================================
 --- curl-7.16.4.orig/libcurl.pc.in     2007-02-18 09:41:27.000000000 +0000
-+++ curl-7.16.4/libcurl.pc.in  2008-02-29 12:19:32.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in  2008-03-18 11:42:43.000000000 +0000
 @@ -33,6 +33,7 @@
  URL: http://curl.haxx.se/
  Description: Library to transfer files with ftp, http, etc.
  Version: @VERSION@
 -Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
 -Libs.private: @LIBCURL_LIBS@ @LIBS@
-+Requires.private: gnutls
++Requires.private: @GNUTLS_REQUIRED@
 +Libs: -L${libdir} -lcurl
 +Libs.private: -ldl -lz
  Cflags: -I${includedir}
+Index: curl-7.16.4/configure.ac
+===================================================================
+--- curl-7.16.4.orig/configure.ac      2008-03-18 11:40:30.000000000 +0000
++++ curl-7.16.4/configure.ac   2008-03-18 11:42:06.000000000 +0000
+@@ -1361,6 +1361,7 @@
+        AC_SUBST(USE_GNUTLS, [1])
+        GNUTLS_ENABLED=1
+        USE_GNUTLS="yes"
++       GNUTLS_REQUIRED="gnutls"
+        curl_ssl_msg="enabled (GnuTLS)"
+        ],
+        [
+@@ -1387,6 +1388,8 @@
+ 
+ fi dnl OPENSSL != 1
+ 
++AC_SUBST(GNUTLS_REQUIRED)
++
+ dnl ----------------------------------------------------
+ dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
+ dnl ----------------------------------------------------

diff --git a/site/avr32-common b/site/avr32-common
index 3d26c16..5b5fae5 100644 (file)
--- a/site/avr32-common
+++ b/site/avr32-common
@@ -28,3 +28,15 @@ lf_cv_sane_realloc=yes
 #sudo
 sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
 
+#popt
+glib_cv_va_copy=${glib_cv_va_copy=yes}
+glib_cv___va_copy=${glib_cv___va_copy=yes}
+ac_cv_va_copy=${ac_cv_va_copy=yes}
+ac_cv___va_copy=${ac_cv___va_copy=yes}
+lftp_cv_va_copy=${lftp_cv_va_copy=yes}
+lftp_cv___va_copy=${lftp_cv___va_copy=yes}
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=yes}
+dpkg_cv_va_copy=${ac_cv_va_copy=yes}
+dpkg_cv___va_copy=${ac_cv___va_copy=yes}
+