Mercurial > mxe-octave
changeset 868:396697e82422
merge
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Thu, 15 Apr 2010 01:42:10 +0200 |
parents | 9c32f9bf98dc (diff) 35fff97cb63a (current diff) |
children | b96e4593c968 |
files | |
diffstat | 2 files changed, 0 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/src/guile-win32.patch Thu Apr 15 01:29:49 2010 +0200 +++ b/src/guile-win32.patch Thu Apr 15 01:42:10 2010 +0200 @@ -22,27 +22,6 @@ CFLAGS="$old_CFLAGS" { $as_echo "$as_me:$LINENO: result: $works" >&5 $as_echo "$works" >&6; } -diff -ruN guile-1.8.7.orig/configure.in guile-1.8.7/configure.in ---- guile-1.8.7.orig/configure.in 2009-07-05 20:40:06.000000000 +0200 -+++ guile-1.8.7/configure.in 2010-04-10 07:27:37.000000000 +0200 -@@ -1374,6 +1374,7 @@ - AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread) - old_CFLAGS="$CFLAGS" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -+if test "$cross_compiling" = "no"; then - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #if HAVE_PTHREAD_ATTR_GETSTACK - #include <pthread.h> -@@ -1404,6 +1405,9 @@ - AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])], - [works=no], - []) -+else -+works=no -+fi - CFLAGS="$old_CFLAGS" - AC_MSG_RESULT($works) - 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 @@ -55,18 +34,6 @@ 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/guile-readline/configure.in guile-1.8.7/guile-readline/configure.in ---- guile-1.8.7.orig/guile-readline/configure.in 2009-07-04 00:19:22.000000000 +0200 -+++ guile-1.8.7/guile-readline/configure.in 2010-04-10 07:13:43.000000000 +0200 -@@ -33,7 +33,7 @@ - fi - AC_SUBST(EXTRA_DEFS) - --for termlib in ncurses curses termcap terminfo termlib ; do -+for termlib in ncurses curses termcap terminfo termlib pdcurses ; do - AC_CHECK_LIB(${termlib}, tgoto, - [LIBS="-l${termlib} $LIBS"; break]) - done 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
--- a/src/guile.mk Thu Apr 15 01:29:49 2010 +0200 +++ b/src/guile.mk Thu Apr 15 01:42:10 2010 +0200 @@ -20,11 +20,6 @@ endef define $(PKG)_BUILD - # avoid running the autotools after patching - find '$(1)' -name 'aclocal.m4' -exec touch {} \; - find '$(1)' -name 'configure' -exec touch {} \; - find '$(1)' -name 'Makefile.in' -exec touch {} \; - find '$(1)' -name '*.h.in' -exec touch {} \; cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \