[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/12] gnu: libtool: support cross-libtool mingw.
From: |
Jan Nieuwenhuizen |
Subject: |
[PATCH 09/12] gnu: libtool: support cross-libtool mingw. |
Date: |
Thu, 18 Aug 2016 08:08:48 +0200 |
* 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
- MinGW guile.exe cross build patch series v10, Jan Nieuwenhuizen, 2016/08/18
- [PATCH 02/12] gnu: Add mingw-w64., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 03/12] gnu: cross-build: i686-w64-mingw32: new cross target., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 04/12] gnu: Add function libiconv-if-needed., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 05/12] gnu: libunistring: support mingw: propagate libiconv if needed., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 06/12] gnu: gmp: build shared library for mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 08/12] gnu: cross-base: Add cross-libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 09/12] gnu: libtool: support cross-libtool mingw.,
Jan Nieuwenhuizen <=
- [PATCH 07/12] gnu: ncurses: support mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 12/12] gnu: guile-2.0: support mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 01/12] gnu: Add gcc-cross-x86_64 packages for testing., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 10/12] gnu: ncurses: build mingw with libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 11/12] gnu: readline: support mingw., Jan Nieuwenhuizen, 2016/08/18