Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

MSYS2 package update for guile-2.2.2

Browse Source 
New package setup with several fixes. Works fine for me.
guile-readline is also working.
This commit is contained in:
Hannes Müller
2017-10-18 14:54:03 +02:00
parent d51c932e82
commit 4baaa7656c
8 changed files with 216 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
guile/0001-Swap-seconds-and-nanoseconds-in-current-time-monotonic.patch Normal file
View File

@@ -0,0 +1,25 @@
commit 886ac3e2abce89bd3f47f957c36bcec16613c509
Author: Ludovic Courtès <ludo@gnu.org>
Date: Sat Apr 22 00:58:10 2017 +0200
SRFI-19: Swap seconds and nanoseconds in 'current-time-monotonic'.
* module/srfi/srfi-19.scm (current-time-monotonic): Swap the 2nd and 3rd
arguments. Fixes a regression introduced in
commit b11e2922c36c4105797c269c7e616535b702698a.
diff --git a/module/srfi/srfi-19.scm b/module/srfi/srfi-19.scm
index c6a55a253..9cf9a2eb5 100644
--- a/module/srfi/srfi-19.scm
+++ b/module/srfi/srfi-19.scm
@@ -336,8 +336,8 @@
;; Guile monotonic and TAI times are the same.
(let ((tai (current-time-tai)))
(make-time time-monotonic
- (time-second tai)
- (time-nanosecond tai))))
+ (time-nanosecond tai)
+ (time-second tai))))
(define (current-time-thread)
(time-error 'current-time 'unsupported-clock-type 'time-thread))

31
guile/0002-Remove-version-in-file-name-of-dynamic-library-guile.patch Normal file
View File

@@ -0,0 +1,31 @@
From dd6c5b70fa0dc66b569a1aacd84b45e417af0372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BCller?= <h.c.f.mueller@gmx.de>
Date: Wed, 26 Apr 2017 10:41:47 +0200
Subject: [PATCH] Remove version in file name of dynamic library guile-readline
To: guile-devel@gnu.org
* guile-readline/Makefile.am: Add -avoid-version to guile_readline_la_LDFLAGS.
Dynamic library guile-readline resides in a "major-version"."minor-version"
directory. Therefore no additional versioning is required. The patch allows
standard installation on MSYS2, which is done without .la files.
---
guile-readline/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index ade7dd09d..36c2f5415 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -51,7 +51,8 @@ guile_readline_la_LIBADD = \
$(READLINE_LIBS) \
../libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la ../lib/libgnu.la
-guile_readline_la_LDFLAGS = -export-dynamic -no-undefined -module
+guile_readline_la_LDFLAGS = -export-dynamic \
+ -no-undefined -module -avoid-version
BUILT_SOURCES = readline.x
--
2.12.1

42
guile/0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch Normal file
View File

@@ -0,0 +1,42 @@
From 35904c82828ec1ba285385192f0578f6cd9f7792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BCller?= <h.c.f.mueller@gmx.de>
Date: Tue, 17 Oct 2017 18:42:51 +0200
Subject: [PATCH] In tests add dynamic-link to msys-2.0 for host-type msys
MSYS2 behaves like Cygwin. Therefore treat them alike.
---
test-suite/standalone/test-ffi | 3 +++
test-suite/standalone/test-foreign-object-scm | 3 +++
2 files changed, 6 insertions(+)
diff --git a/test-suite/standalone/test-ffi b/test-suite/standalone/test-ffi
index 0e6ab45d1..eb0a0d28f 100755
--- a/test-suite/standalone/test-ffi
+++ b/test-suite/standalone/test-ffi
@@ -269,6 +269,9 @@ exec guile -q -s "$0" "$@"
;; into linked DLLs. Thus one needs to link to the core
;; C library DLL explicitly.
(dynamic-link "cygwin1"))
+ ((string-contains %host-type "msys")
+ ;; MSYS2 behaves like Cygwin
+ (dynamic-link "msys-2.0"))
(else
(dynamic-link))))
diff --git a/test-suite/standalone/test-foreign-object-scm b/test-suite/standalone/test-foreign-object-scm
index fd4669aa9..0c4114d2a 100755
--- a/test-suite/standalone/test-foreign-object-scm
+++ b/test-suite/standalone/test-foreign-object-scm
@@ -35,6 +35,9 @@ exec guile -q -s "$0" "$@"
;; needs to link to the core C library DLL
;; explicitly.
(dynamic-link "cygwin1"))
+ ((string-contains %host-type "msys")
+ ;; MSYS2 behaves like Cygwin
+ (dynamic-link "msys-2.0"))
(else
(dynamic-link)))))
(lambda (k . args)
--
2.14.2

52
guile/0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch Normal file
View File

@@ -0,0 +1,52 @@
From a64825ffa6be30bcb876557383dbdd106da51c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BCller?= <h.c.f.mueller@gmx.de>
Date: Tue, 17 Oct 2017 19:12:41 +0200
Subject: [PATCH] Skip tests using setrlimit for MSYS as done for Cygwin
MSYS2 behaves like Cygwin. Therefore treat them alike.
---
test-suite/standalone/test-out-of-memory | 8 ++++++++
test-suite/standalone/test-stack-overflow | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/test-suite/standalone/test-out-of-memory b/test-suite/standalone/test-out-of-memory
index 221651270..4e5ecc81f 100755
--- a/test-suite/standalone/test-out-of-memory
+++ b/test-suite/standalone/test-out-of-memory
@@ -23,6 +23,14 @@ exec guile -q -s "$0" "$@"
;; test-stack-overflow.
(exit 77)) ; unresolved
+(when (string-contains-ci (vector-ref (uname) 0) "MSYS_NT")
+ ;; attempting to use setrlimit for memory RLIMIT_AS will always
+ ;; produce an invalid argument error on MSYS2 (tested on
+ ;; MSYS_NT-6.1-WOW DLL v2.9.0). Proceeding with the test would fill
+ ;; all available memory and probably end in a crash. See also
+ ;; test-stack-overflow.
+ (exit 77)) ; unresolved
+
(catch #t
;; Silence GC warnings.
(lambda ()
diff --git a/test-suite/standalone/test-stack-overflow b/test-suite/standalone/test-stack-overflow
index dd54249d8..83e929159 100755
--- a/test-suite/standalone/test-stack-overflow
+++ b/test-suite/standalone/test-stack-overflow
@@ -23,6 +23,14 @@ exec guile -q -s "$0" "$@"
;; test-out-of-memory.
(exit 77)) ; unresolved
+(when (string-contains-ci (vector-ref (uname) 0) "MSYS_NT")
+ ;; attempting to use setrlimit for memory RLIMIT_AS will always
+ ;; produce an invalid argument error on MSYS2 (tested on
+ ;; MSYS_NT-6.1-WOW DLL v2.9.0). Proceeding with the test would fill
+ ;; all available memory and probably end in a crash. See also
+ ;; test-out-of-memory.
+ (exit 77)) ; unresolved
+
;; 100 MB.
(define *limit* (* 100 1024 1024))
--
2.14.2

35
guile/0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch Normal file
View File

@@ -0,0 +1,35 @@
From 6620b25a564f01468ab4aaa895cfcd4f75424f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BCller?= <h.c.f.mueller@gmx.de>
Date: Tue, 17 Oct 2017 19:23:39 +0200
Subject: [PATCH] Activate test-pthread-create-secondary for CYGWIN/MSYS
This test is passed on CYGWIN/MSYS
---
test-suite/standalone/test-pthread-create-secondary.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test-suite/standalone/test-pthread-create-secondary.c b/test-suite/standalone/test-pthread-create-secondary.c
index 14ea240a4..aedb3b8fb 100644
--- a/test-suite/standalone/test-pthread-create-secondary.c
+++ b/test-suite/standalone/test-pthread-create-secondary.c
@@ -39,7 +39,7 @@
Maidanski. See <http://thread.gmane.org/gmane.lisp.guile.bugs/5340>
for details. */
-#if defined __linux__ \
+#if (defined __linux__ || defined __CYGWIN__) \
&& (GC_VERSION_MAJOR > 7 \
|| (GC_VERSION_MAJOR == 7 && GC_VERSION_MINOR > 2) \
|| (GC_VERSION_MAJOR == 7 && GC_VERSION_MINOR == 2 \
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
}
-#else /* Linux && GC < 7.2alpha5 */
+#else /* !(Linux || Cygwin) || GC < 7.2alpha5 */
int
main (int argc, char *argv[])
--
2.14.2

43
guile/PKGBUILD
View File

@@ -1,24 +1,41 @@
# makepkg -sL --skipchecksums
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgbase=guile
pkgname=("$pkgbase" "lib${pkgbase}" "lib${pkgbase}-devel")
pkgver=2.0.14
pkgver=2.2.2
pkgrel=1
pkgdesc="a portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
arch=(i686 x86_64)
license=('GPL')
makedepends=('libltdl' 'gmp-devel' 'ncurses-devel' 'libunistring-devel' 'libgc-devel' 'libffi-devel' 'texinfo')
source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
guile-2.2.2-msys2.patch)
source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
0001-Swap-seconds-and-nanoseconds-in-current-time-monotonic.patch
0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
)
options=('!libtool')
sha256sums=('8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1'
'59f1c5dac06b542e48159e563ff2704b60343346d8f9fcee60538e9cd20ac1e5')
sha256sums=('1c91a46197fb1adeba4fd62a25efcf3621c6450be166d7a7062ef6ca7e11f5ab'
'a535dd38a8ffd2ce3335927853d9159a6a7cab57cadd50a70a007e49bfc578f5'
'440d31e6100bf896fcd5d65209da42bfeec43f154fa023fceeae911194ecb15c'
'7b06f92cca1b10f1006f53f27b0ed0c653eaa3a1de3732b69364e28b1b36fd1e'
'31124d7053454eb082a815b8d15249621dfb92aff50400090854d1f47b174f25'
'b66d33a35942c4d4575d169974f91f3e525f6de4fb82e61dc70723e0a43123d6'
)
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -p1 -i ${srcdir}/guile-2.2.2-msys2.patch
patch -p1 -i ${srcdir}/0001-Swap-seconds-and-nanoseconds-in-current-time-monotonic.patch
patch -p1 -i ${srcdir}/0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
patch -p1 -i ${srcdir}/0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
patch -p1 -i ${srcdir}/0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
patch -p1 -i ${srcdir}/0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
cp -rf build-aux/snippet ${srcdir}/snippet
autoreconf -fi
@@ -39,7 +56,7 @@ build() {
--enable-nls \
--enable-posix \
--enable-regex \
--without-threads \
--with-threads \
--with-modules \
--disable-static
make
@@ -47,7 +64,7 @@ build() {
}
package_guile() {
depends=('libguile' 'info')
depends=("libguile=${pkgver}" 'info')
install=${pkgbase}.install
mkdir -p ${pkgdir}/usr/bin
@@ -56,7 +73,6 @@ package_guile() {
rm -f ${pkgdir}/usr/bin/*-config
mkdir -p ${pkgdir}/usr/share
#cp -rf ${srcdir}/dest/usr/share/doc $pkgdir/usr/share/
cp -rf ${srcdir}/dest/usr/share/info ${pkgdir}/usr/share/
cp -rf ${srcdir}/dest/usr/share/man ${pkgdir}/usr/share/
}
@@ -66,16 +82,11 @@ package_libguile() {
groups=('libraries')
mkdir -p ${pkgdir}/usr/bin
(ls ${srcdir}/dest/usr/bin/*.dll &>/dev/null) && \
install -Dm755 ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
(ls ${srcdir}/dest/usr/lib/*.dll &>/dev/null) && \
install -Dm755 ${srcdir}/dest/usr/lib/*.dll ${pkgdir}/usr/bin/
#cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
mkdir -p ${pkgdir}/usr/share
cp -rf ${srcdir}/dest/usr/share/guile ${pkgdir}/usr/share/
cp -rf ${srcdir}/dest/usr/share/guile ${pkgdir}/usr/share/
mkdir -p ${pkgdir}/usr/lib
cp -rf ${srcdir}/dest/usr/lib/guile ${pkgdir}/usr/lib/
}

921
guile/guile-2.2.2-msys2.patch
View File

@@ -1,921 +0,0 @@
diff -durN guile-2.2.2.orig/build-aux/ar-lib guile-2.2.2/build-aux/ar-lib
--- guile-2.2.2.orig/build-aux/ar-lib 2017-04-21 22:01:12.000000000 +0800
+++ guile-2.2.2/build-aux/ar-lib 2017-05-13 21:45:31.828125000 +0800
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -65,7 +65,7 @@
mingw)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin)
+ cygwin | msys)
file=`cygpath -m "$file" || echo "$file"`
;;
wine)
diff -durN guile-2.2.2.orig/build-aux/compile guile-2.2.2/build-aux/compile
--- guile-2.2.2.orig/build-aux/compile 2017-04-21 22:01:12.000000000 +0800
+++ guile-2.2.2/build-aux/compile 2017-05-13 21:46:15.812500000 +0800
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -durN guile-2.2.2.orig/build-aux/config.guess guile-2.2.2/build-aux/config.guess
--- guile-2.2.2.orig/build-aux/config.guess 2017-04-21 22:01:12.000000000 +0800
+++ guile-2.2.2/build-aux/config.guess 2017-05-13 21:47:53.515625000 +0800
@@ -867,6 +867,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
diff -durN guile-2.2.2.orig/build-aux/config.rpath guile-2.2.2/build-aux/config.rpath
--- guile-2.2.2.orig/build-aux/config.rpath 2017-02-16 04:34:52.000000000 +0800
+++ guile-2.2.2/build-aux/config.rpath 2017-05-13 21:49:12.140625000 +0800
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -348,7 +348,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -533,7 +533,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -durN guile-2.2.2.orig/build-aux/ltmain.sh guile-2.2.2/build-aux/ltmain.sh
--- guile-2.2.2.orig/build-aux/ltmain.sh 2017-04-21 22:01:48.000000000 +0800
+++ guile-2.2.2/build-aux/ltmain.sh 2017-05-13 21:55:14.671875000 +0800
@@ -2418,7 +2418,7 @@
case $host in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -3439,7 +3439,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | pw32* | os2* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
pic_mode=default
;;
esac
@@ -4313,7 +4313,7 @@
'exit $?'
tstripme=$stripme
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=
@@ -4426,7 +4426,7 @@
# Do a test to see if this is really a libtool program.
case $host in
- *cygwin* | *mingw*)
+ *cygwin* | *msys* | *mingw*)
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -4501,7 +4501,7 @@
# remove .exe since cygwin /usr/bin/install will append another
# one anyway
case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
+ */usr/bin/install*,*cygwin* | */usr/bin/install*,*msys*)
case $file:$destfile in
*.exe:*.exe)
# this is ok
@@ -4654,7 +4654,7 @@
$RM $export_symbols
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -4666,7 +4666,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -4680,7 +4680,7 @@
func_basename "$dlprefile"
name=$func_basename_result
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -4855,7 +4855,7 @@
# Transform the symbol file into the correct name.
symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -5753,7 +5753,7 @@
{
EOF
case $host in
- *mingw* | *cygwin* )
+ *mingw* | *cygwin* | *msys*)
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -6492,7 +6492,7 @@
$debug_cmd
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra
@@ -6991,7 +6991,7 @@
;;
esac
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -7011,7 +7011,7 @@
-l*)
if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -7094,7 +7094,7 @@
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
func_warning "'-no-install' is ignored for $host"
@@ -7988,7 +7988,7 @@
fi
case $host in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present
@@ -8132,7 +8132,7 @@
if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc* | *os2*)
+ *cygwin* | *msys* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -8202,7 +8202,7 @@
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc* | *os2*)
+ *cygwin* | *msys* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
versuffix=-$major
@@ -9112,7 +9112,7 @@
if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -9626,7 +9626,7 @@
orig_export_symbols=
case $host_os in
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
func_dll_def_p "$export_symbols" || {
@@ -10185,7 +10185,7 @@
prog)
case $host in
- *cygwin*) func_stripname '' '.exe' "$output"
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -10296,7 +10296,7 @@
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -10374,7 +10374,7 @@
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=false
;;
- *cygwin* | *mingw* )
+ *cygwin* | *msys* | *mingw* )
test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
@@ -10520,14 +10520,14 @@
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
- *cygwin*)
+ *cygwin* | *msys*)
exeext=.exe
func_stripname '' '.exe' "$outputname"
outputname=$func_stripname_result ;;
*) exeext= ;;
esac
case $host in
- *cygwin* | *mingw* )
+ *cygwin* | *msys* | *mingw* )
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -10859,7 +10859,7 @@
# tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
diff -durN guile-2.2.2.orig/config.rpath guile-2.2.2/config.rpath
--- guile-2.2.2.orig/config.rpath 2015-04-12 04:07:14.000000000 +0800
+++ guile-2.2.2/config.rpath 2017-05-13 21:58:19.484375000 +0800
@@ -64,7 +64,7 @@
;;
esac
;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | msys* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -132,7 +132,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -182,7 +182,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -326,7 +326,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -517,7 +517,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -durN guile-2.2.2.orig/configure guile-2.2.2/configure
--- guile-2.2.2.orig/configure 2017-04-21 22:01:10.000000000 +0800
+++ guile-2.2.2/configure 2017-05-13 22:06:33.000000000 +0800
@@ -4832,7 +4832,7 @@
enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -9008,7 +9008,7 @@
# special semantics and is distinct from /, please report it to
# <bug-gnulib@gnu.org>.
case $host in
- *-cygwin | i370-ibm-openedition)
+ *-cygwin | *-msys | i370-ibm-openedition)
gl_cv_double_slash_root=yes ;;
*)
# Be optimistic and assume that / and // are the same when we
@@ -16874,7 +16874,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
@@ -22193,7 +22193,7 @@
# special semantics and is distinct from /, please report it to
# <bug-gnulib@gnu.org>.
case $host in
- *-cygwin | i370-ibm-openedition)
+ *-cygwin | *-msys | i370-ibm-openedition)
gl_cv_double_slash_root=yes ;;
*)
# Be optimistic and assume that / and // are the same when we
@@ -26889,7 +26889,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
@@ -32262,6 +32262,8 @@
case "$host_os" in
# Guess no on Cygwin.
cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess no on msys.
+ msys*) gl_cv_func_btowc_nul="guessing no" ;;
# Guess yes otherwise.
*) gl_cv_func_btowc_nul="guessing yes" ;;
esac
@@ -32502,6 +32504,8 @@
gl_cv_func_dup2_works="guessing no" ;;
cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
gl_cv_func_dup2_works="guessing no" ;;
+ msys*) # on MSYS, dup2(1,1) returns 0
+ gl_cv_func_dup2_works="guessing no" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
# not EBADF.
@@ -39342,7 +39346,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -39508,7 +39512,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -39516,12 +39520,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -39587,7 +39591,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -39742,7 +39746,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -40058,7 +40062,7 @@
lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -40550,7 +40554,7 @@
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -42628,7 +42632,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -42731,7 +42735,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -43233,7 +43237,7 @@
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -43348,7 +43352,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -43888,7 +43892,7 @@
export_dynamic_flag_spec=-rdynamic
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -44923,7 +44927,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -44955,6 +44959,12 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
@@ -44989,7 +44999,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -45691,7 +45701,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -49580,7 +49590,7 @@
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
diff -durN guile-2.2.2.orig/lib/Makefile.am guile-2.2.2/lib/Makefile.am
--- guile-2.2.2.orig/lib/Makefile.am 2017-04-17 17:32:01.000000000 +0800
+++ guile-2.2.2/lib/Makefile.am 2017-05-13 22:09:02.640625000 +0800
@@ -1043,7 +1043,7 @@
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -durN guile-2.2.2.orig/lib/Makefile.in guile-2.2.2/lib/Makefile.in
--- guile-2.2.2.orig/lib/Makefile.in 2017-04-21 22:01:13.000000000 +0800
+++ guile-2.2.2/lib/Makefile.in 2017-05-13 22:09:21.312500000 +0800
@@ -2654,7 +2654,7 @@
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -durN guile-2.2.2.orig/m4/btowc.m4 guile-2.2.2/m4/btowc.m4
--- guile-2.2.2.orig/m4/btowc.m4 2017-02-16 04:34:55.000000000 +0800
+++ guile-2.2.2/m4/btowc.m4 2017-05-13 22:11:12.859375000 +0800
@@ -50,6 +50,8 @@
case "$host_os" in
# Guess no on Cygwin.
cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+ # Guess no on msys.
+ msys*) gl_cv_func_btowc_nul="guessing no" ;;
# Guess yes otherwise.
*) gl_cv_func_btowc_nul="guessing yes" ;;
esac
diff -durN guile-2.2.2.orig/m4/double-slash-root.m4 guile-2.2.2/m4/double-slash-root.m4
--- guile-2.2.2.orig/m4/double-slash-root.m4 2017-02-16 04:34:55.000000000 +0800
+++ guile-2.2.2/m4/double-slash-root.m4 2017-05-13 22:11:54.218750000 +0800
@@ -16,7 +16,7 @@
# special semantics and is distinct from /, please report it to
# <bug-gnulib@gnu.org>.
case $host in
- *-cygwin | i370-ibm-openedition)
+ *-cygwin | *-msys | i370-ibm-openedition)
gl_cv_double_slash_root=yes ;;
*)
# Be optimistic and assume that / and // are the same when we
diff -durN guile-2.2.2.orig/m4/dup2.m4 guile-2.2.2/m4/dup2.m4
--- guile-2.2.2.orig/m4/dup2.m4 2017-02-16 04:34:55.000000000 +0800
+++ guile-2.2.2/m4/dup2.m4 2017-05-13 22:12:48.796875000 +0800
@@ -80,6 +80,8 @@
gl_cv_func_dup2_works="guessing no" ;;
cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
gl_cv_func_dup2_works="guessing no" ;;
+ msys*) # on MSYS, dup2(1,1) returns 0
+ gl_cv_func_dup2_works="guessing no" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
# not EBADF.
diff -durN guile-2.2.2.orig/m4/libtool.m4 guile-2.2.2/m4/libtool.m4
--- guile-2.2.2.orig/m4/libtool.m4 2017-04-21 22:01:01.000000000 +0800
+++ guile-2.2.2/m4/libtool.m4 2017-05-13 22:20:34.453125000 +0800
@@ -1692,7 +1692,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1940,7 +1940,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -2521,7 +2521,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -2553,6 +2553,12 @@
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
@@ -2587,7 +2593,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -3365,7 +3371,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -3458,7 +3464,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -3771,7 +3777,7 @@
[lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3841,7 +3847,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3916,7 +3922,7 @@
aix*)
symcode='[[BCDT]]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -4222,7 +4228,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4298,7 +4304,7 @@
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4546,7 +4552,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4650,7 +4656,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4925,7 +4931,7 @@
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
case $cc_basename in
cl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -4983,7 +4989,7 @@
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -5098,7 +5104,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -5554,7 +5560,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -6629,7 +6635,7 @@
esac
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -8317,7 +8323,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -8325,12 +8331,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
diff -durN guile-2.2.2.orig/m4/ltoptions.m4 guile-2.2.2/m4/ltoptions.m4
--- guile-2.2.2.orig/m4/ltoptions.m4 2017-04-21 22:01:01.000000000 +0800
+++ guile-2.2.2/m4/ltoptions.m4 2017-05-13 22:21:52.218750000 +0800
@@ -128,7 +128,7 @@
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -durN guile-2.2.2.orig/m4/malloc.m4 guile-2.2.2/m4/malloc.m4
--- guile-2.2.2.orig/m4/malloc.m4 2017-02-16 04:34:56.000000000 +0800
+++ guile-2.2.2/m4/malloc.m4 2017-05-13 22:22:21.921875000 +0800
@@ -33,7 +33,7 @@
[case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
diff -durN guile-2.2.2.orig/m4/printf.m4 guile-2.2.2/m4/printf.m4
--- guile-2.2.2.orig/m4/printf.m4 2017-02-16 04:34:56.000000000 +0800
+++ guile-2.2.2/m4/printf.m4 2017-05-13 22:23:50.265625000 +0800
@@ -723,6 +723,7 @@
irix*) gl_cv_func_printf_directive_ls="guessing no";;
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ msys*) gl_cv_func_printf_directive_ls="guessing no";;
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
*) gl_cv_func_printf_directive_ls="guessing yes";;
esac
@@ -800,6 +801,7 @@
changequote(,)dnl
case "$host_os" in
cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
+ msys*) gl_cv_func_printf_flag_grouping="guessing no";;
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
*) gl_cv_func_printf_flag_grouping="guessing yes";;
@@ -1452,6 +1454,8 @@
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Cygwin.
cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on msys.
+ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Solaris >= 2.6.
solaris2.[0-5] | solaris2.[0-5].*)
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;

7
guile/guile.install
View File

@@ -1,7 +1,5 @@
infodir=/usr/share/info
filelist="goops.info
guile-tut.info
guile.info
filelist="guile.info
guile.info-1
guile.info-2
guile.info-3
@@ -9,6 +7,9 @@ filelist="goops.info
guile.info-5
guile.info-6
guile.info-7
guile.info-8
guile.info-9
guile.info-10
r5rs.info"
post_install() {