view src/guile-1-win32.patch @ 5541:d862fd40cc42

Use ccache for packages built with cmake. * Makefile.in: New variable CMAKE_CCACHE_FLAGS. * src/armadillo.mk, src/cgal.mk, src/cmake.mk, src/cminpack, src/double-conversion.mk, src/eigen.mk, src/gdcm.mk, src/gl2ps.mk, src/hdf5.mk, src/lapack.mk, src/libical.mk, src/libproxy, src/llvm.mk, src/of-dicom.mk, src/openal.mk, src/opencv.mk, src/openexr.mk, src/openscenegraph.mk, src/physfs.mk, src/qhull.mk, src/qjson.mk, src/rapidjson.mk, src/suitesparse.mk, src/sundials-ida.mk, src/taglib.mk, src/vigra.mk, src/vmime.mk, src/vtk.mk, src/wt.mk: Add new variable to cmake flags. Harmonize indentation in files.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 20 Sep 2020 11:57:01 +0200
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure
--- guile-1.8.7.orig/configure	2009-07-05 22:25:00.000000000 +0200
+++ guile-1.8.7/configure	2010-04-10 07:35:25.000000000 +0200
@@ -35057,6 +35057,7 @@
 $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; }
 old_CFLAGS="$CFLAGS"
 CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+if test "$cross_compiling" = "no"; then
 if test "$cross_compiling" = yes; then
   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -35140,6 +35141,9 @@
 fi
 
 
+else
+works=no
+fi
 CFLAGS="$old_CFLAGS"
 { $as_echo "$as_me:$LINENO: result: $works" >&5
 $as_echo "$works" >&6; }
diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure
--- guile-1.8.7.orig/guile-readline/configure	2009-07-05 22:24:45.000000000 +0200
+++ guile-1.8.7/guile-readline/configure	2010-04-10 07:36:18.000000000 +0200
@@ -12353,7 +12353,7 @@
 fi
 
 
-for termlib in ncurses curses termcap terminfo termlib ; do
+for termlib in ncurses curses termcap terminfo termlib pdcurses ; do
    as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5
 $as_echo_n "checking for tgoto in -l${termlib}... " >&6; }
diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h
--- guile-1.8.7.orig/libguile/__scm.h	2009-07-04 00:18:59.000000000 +0200
+++ guile-1.8.7/libguile/__scm.h	2010-04-10 07:58:48.000000000 +0200
@@ -150,7 +150,7 @@
    which should be exported or imported in the resulting dynamic link
    library (DLL) in the Win32 port. */
 
-#if defined (SCM_IMPORT)
+#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT)
 # define SCM_API __declspec (dllimport) extern
 #elif defined (SCM_EXPORT) || defined (DLL_EXPORT)
 # define SCM_API __declspec (dllexport) extern