From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: [PATCH 08/11] gnu: libtool: support cross-libtool mingw. Date: Sun, 8 May 2016 22:42:46 +0200 Message-ID: <1462740169-15029-9-git-send-email-janneke@gnu.org> References: <1462740169-15029-1-git-send-email-janneke@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azVXk-0004X3-9P for guix-devel@gnu.org; Sun, 08 May 2016 16:43:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azVXd-0008HP-Tr for guix-devel@gnu.org; Sun, 08 May 2016 16:43:11 -0400 In-Reply-To: <1462740169-15029-1-git-send-email-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 | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 42 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 ddc628d..30c0482 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -272,7 +272,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..1246bd7 --- /dev/null +++ b/gnu/packages/patches/libtool-mingw.patch @@ -0,0 +1,40 @@ +I do not know why stat (and other functions here) get #define'd to their +underscore variants; I find no apparent need or rationale for that. However, +redefining stat also impacts struct stat, breaking lstat's signature. That is +fixed be #define'ing lstat along. + +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,12 +3658,10 @@ + #if defined _MSC_VER + # define setmode _setmode +-# define stat _stat + # define chmod _chmod + # define getcwd _getcwd + # define putenv _putenv + # define S_IXUSR _S_IEXEC + #elif defined __MINGW32__ + # define setmode _setmode +-# 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 +@@ -5569,6 +5569,5 @@ + /* portability defines, excluding path handling macros */ + #if defined _MSC_VER + # define setmode _setmode +-# define stat _stat + # define chmod _chmod + # define getcwd _getcwd +@@ -5576,6 +5577,5 @@ + # define S_IXUSR _S_IEXEC + #elif defined __MINGW32__ + # define setmode _setmode +-# define stat _stat + # define chmod _chmod + # define getcwd _getcwd -- 2.7.3