Mercurial > mxe-octave
annotate src/guile-1-win32.patch @ 3705:d30ced3f489e
libpng: update to 1.6.13
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 02 Sep 2014 11:45:16 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
972
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
3 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
4 diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
5 --- guile-1.8.7.orig/configure 2009-07-05 22:25:00.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
6 +++ guile-1.8.7/configure 2010-04-10 07:35:25.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
7 @@ -35057,6 +35057,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
8 $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
9 old_CFLAGS="$CFLAGS" |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
10 CFLAGS="$PTHREAD_CFLAGS $CFLAGS" |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
11 +if test "$cross_compiling" = "no"; then |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
12 if test "$cross_compiling" = yes; then |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
13 { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
14 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
15 @@ -35140,6 +35141,9 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
16 fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
17 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
18 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
19 +else |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
20 +works=no |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
21 +fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
22 CFLAGS="$old_CFLAGS" |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
23 { $as_echo "$as_me:$LINENO: result: $works" >&5 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
24 $as_echo "$works" >&6; } |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
25 diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
26 --- guile-1.8.7.orig/guile-readline/configure 2009-07-05 22:24:45.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
27 +++ guile-1.8.7/guile-readline/configure 2010-04-10 07:36:18.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
28 @@ -12353,7 +12353,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
29 fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
30 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
31 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
32 -for termlib in ncurses curses termcap terminfo termlib ; do |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
33 +for termlib in ncurses curses termcap terminfo termlib pdcurses ; do |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
34 as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh` |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
35 { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
36 $as_echo_n "checking for tgoto in -l${termlib}... " >&6; } |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
37 diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
38 --- guile-1.8.7.orig/libguile/__scm.h 2009-07-04 00:18:59.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
39 +++ guile-1.8.7/libguile/__scm.h 2010-04-10 07:58:48.000000000 +0200 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
40 @@ -150,7 +150,7 @@ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
41 which should be exported or imported in the resulting dynamic link |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
42 library (DLL) in the Win32 port. */ |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
43 |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
44 -#if defined (SCM_IMPORT) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
45 +#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
46 # define SCM_API __declspec (dllimport) extern |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
47 #elif defined (SCM_EXPORT) || defined (DLL_EXPORT) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
48 # define SCM_API __declspec (dllexport) extern |