diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/libmicrohttpd/libmicrohttpd-0001-cross.patch | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libmicrohttpd/libmicrohttpd-0001-cross.patch')
| -rw-r--r-- | package/libmicrohttpd/libmicrohttpd-0001-cross.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/package/libmicrohttpd/libmicrohttpd-0001-cross.patch b/package/libmicrohttpd/libmicrohttpd-0001-cross.patch deleted file mode 100644 index 5980b9c419..0000000000 --- a/package/libmicrohttpd/libmicrohttpd-0001-cross.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix cross-compilation - -Patch sent upstream: http://article.gmane.org/gmane.comp.gnu.libmicrohttpd/1193 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> - -diff -uNr libmicrohttpd-0.9.35.org/configure.ac libmicrohttpd-0.9.35/configure.ac ---- libmicrohttpd-0.9.35.org/configure.ac 2014-05-02 20:38:40.000000000 +0200 -+++ libmicrohttpd-0.9.35/configure.ac 2014-05-04 09:17:00.000000000 +0200 -@@ -639,8 +639,7 @@ - SAVE_CPPFLAGS="$CPPFLAGS" - LDFLAGS="-L$with_gnutls/lib $LDFLAGS" - CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" -- AC_CHECK_FILE([$with_gnutls/include/gnutls/gnutls.h], -- [AC_CHECK_HEADERS([gnutls/gnutls.h], -+ AC_CHECK_HEADERS([gnutls/gnutls.h], - [AC_CHECK_LIB([gnutls], [gnutls_priority_set], - [ - GNUTLS_CPPFLAGS="-I$with_gnutls/include" -@@ -648,7 +647,7 @@ - GNUTLS_LIBS="-lgnutls" - AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])]) - have_gnutls=yes -- ])])]) -+ ])]) - AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" |
