Mercurial > mxe-octave
view src/libssh2-1-fixes.patch @ 3629:5aba05f2226e
update xine-lib, add mman-win32
* dist-files.mk: add mman-win32-1-include_name_change.patch, mman-win32.mk, add xine-lib-*.patch files.
* index.html: add mman-win32
* src/mman-win32-1-include_name_change.patch: new file.
* src/mman-win32.mk: new file.
* src/xine-lib-1-configure_ac.patch: new file
* src/xine-lib-1-fixes.patch: removed
* src/xine-lib-2-build_fixes.patch: new file.
* src/xine-lib-3-more_build_fixes.patch: new file
* src/xine-lib-4-mkdir.patch: new file.
* src/xine-lib-5-change_mma_h_to_mma_win32_h.patch: new file
* src/xine-lib.mk: update version
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 29 Jun 2014 15:46:35 -0400 |
parents | d427b570804c |
children | 64912b529fc3 |
line wrap: on
line source
This file is part of MXE. See index.html for further information. From 0e2179c67d0cd618be29b30425bda18c23a2ddf0 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov <onlyjob@member.fsf.org> Date: Mon, 13 Aug 2012 23:34:51 +0200 Subject: [PATCH 1/2] configure: gcrypt doesn't come with pkg-config support ... so use plain old -lgcrypt to the linker to link with it. Fixes #225 (cherry picked from commit e470738a0cf302abfd2891b80dbac4ac3e7eedd2) diff --git a/configure.ac b/configure.ac index aa9d397..dfc6988 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,7 @@ fi # Look for libgcrypt if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) - LIBSREQUIRED=libgcrypt + LIBS="$LIBS -lgcrypt" fi AC_SUBST(LIBSREQUIRED) -- 1.7.10.4 From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 2 Sep 2012 00:55:28 +0200 Subject: [PATCH 2/2] include gpg-error with gcrypt for static linking (mxe-specific) diff --git a/configure.ac b/configure.ac index dfc6988..748dd21 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ fi if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) LIBS="$LIBS -lgcrypt" + LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`" fi AC_SUBST(LIBSREQUIRED) -- 1.7.10.4