From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: [PATCH 09/12] gnu: libtool: support cross-libtool mingw. Date: Thu, 18 Aug 2016 08:08:48 +0200 Message-ID: <20160818060851.2853-10-janneke@gnu.org> References: <20160818060851.2853-1-janneke@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baGW8-00007t-0O for guix-devel@gnu.org; Thu, 18 Aug 2016 02:09:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baGW4-0008UI-CO for guix-devel@gnu.org; Thu, 18 Aug 2016 02:09:26 -0400 In-Reply-To: <20160818060851.2853-1-janneke@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/patches/libtool-mingw.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/autotools.scm (libtool): Support cross-libtool for MinGW. --- gnu/packages/autotools.scm | 3 ++- gnu/packages/patches/libtool-mingw.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtool-mingw.patch diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 21ed0e6..f6706ca 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -295,7 +295,8 @@ Makefile, simplifying the entire process for the developer.") (sha256 (base32 "0vxj52zm709125gwv9qqlw02silj8bnjnh4y07arrz60r31ai1vw")) - (patches (search-patches "libtool-skip-tests2.patch")))) + (patches (search-patches "libtool-skip-tests2.patch" + "libtool-mingw.patch")))) (build-system gnu-build-system) (propagated-inputs `(("m4" ,m4))) (native-inputs `(("m4" ,m4) diff --git a/gnu/packages/patches/libtool-mingw.patch b/gnu/packages/patches/libtool-mingw.patch new file mode 100644 index 0000000..d406f63 --- /dev/null +++ b/gnu/packages/patches/libtool-mingw.patch @@ -0,0 +1,28 @@ +With lstat and _lstat are added to MinGW we need to #define lstat along with +stat because #define'ing stat impacts struct stat, which would otherwise break +lstat's signature. + +Jan Nieuwenhuizen + +Upstream status: not yet presented upstream. + +--- libtool-2.4.6/build-aux/ltmain.in~ 2015-02-06 13:57:56.000000000 +0100 ++++ libtool-2.4.6/build-aux/ltmain.in 2016-05-06 07:46:29.425142546 +0200 +@@ -3658,6 +3658,7 @@ + # define S_IXUSR _S_IEXEC + #elif defined __MINGW32__ + # define setmode _setmode ++# define lstat _lstat + # define stat _stat + # define chmod _chmod + # define getcwd _getcwd +--- libtool-2.4.6/build-aux/ltmain.sh~ 2015-02-15 17:15:12.000000000 +0100 ++++ libtool-2.4.6/build-aux/ltmain.sh 2016-05-06 08:31:53.854857844 +0200 +@@ -5576,6 +5577,7 @@ + # define S_IXUSR _S_IEXEC + #elif defined __MINGW32__ + # define setmode _setmode ++# define lstat _lstat + # define stat _stat + # define chmod _chmod + # define getcwd _getcwd -- 2.9.2