| 1 |
xarthisius 10/06/27 12:33:37 |
| 2 |
|
| 3 |
Added: starparse-1.0-guile1.8.patch |
| 4 |
Log: |
| 5 |
Fix building with guile-1.8 and tests wrt bug 325731. Thanks to Diego for reporting. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/starparse/files/starparse-1.0-guile1.8.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/starparse/files/starparse-1.0-guile1.8.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/starparse/files/starparse-1.0-guile1.8.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: starparse-1.0-guile1.8.patch |
| 15 |
=================================================================== |
| 16 |
--- src/guile-binding.c |
| 17 |
+++ src/guile-binding.c |
| 18 |
@@ -61,10 +61,10 @@ |
| 19 |
char* filter_string = NULL; |
| 20 |
char* fname = "-"; |
| 21 |
|
| 22 |
- if (SCM_NFALSEP(filter_string_scm)) |
| 23 |
+ if (scm_is_true(filter_string_scm)) |
| 24 |
filter_string = scm_to_locale_string(filter_string_scm); |
| 25 |
|
| 26 |
- if (SCM_NFALSEP(fname_scm)) |
| 27 |
+ if (scm_is_true(fname_scm)) |
| 28 |
fname = scm_to_locale_string(fname_scm); |
| 29 |
|
| 30 |
ship_item_cb = ship_item_scm; |
| 31 |
--- src/Makefile.am |
| 32 |
+++ src/Makefile.am |
| 33 |
@@ -6,13 +6,10 @@ |
| 34 |
libstarparse_la_SOURCES =\ |
| 35 |
parser.y lexer.l starparse.h |
| 36 |
|
| 37 |
-libstarparse_la_CFLAGS = |
| 38 |
-libstarparse_la_LDFLAGS = |
| 39 |
- |
| 40 |
if ENABLE_GUILE |
| 41 |
libstarparse_la_SOURCES += guile-binding.c guile-compat.h |
| 42 |
-libstarparse_la_CFLAGS += @GUILE_CFLAGS@ |
| 43 |
-libstarparse_la_LDFLAGS += @GUILE_LDFLAGS@ -lpthread |
| 44 |
+libstarparse_la_CFLAGS = @GUILE_CFLAGS@ |
| 45 |
+libstarparse_la_LIBADD = @GUILE_LIBS@ -lpthread |
| 46 |
endif |
| 47 |
|
| 48 |
|
| 49 |
--- configure.ac |
| 50 |
+++ configure.ac |
| 51 |
@@ -10,18 +10,13 @@ |
| 52 |
|
| 53 |
AM_INIT_AUTOMAKE |
| 54 |
|
| 55 |
-AC_ARG_ENABLE(guile, |
| 56 |
+AC_ARG_ENABLE([guile], |
| 57 |
AS_HELP_STRING([--enable-guile], |
| 58 |
- [build bindings for guile scheme interpreter]), |
| 59 |
- USE_GUILE=$enable_guile, |
| 60 |
- USE_GUILE=yes) # default value |
| 61 |
- |
| 62 |
-if test "x$USE_GUILE" = "xyes"; |
| 63 |
-then |
| 64 |
- GUILE_FLAGS |
| 65 |
-fi |
| 66 |
- |
| 67 |
-AM_CONDITIONAL(ENABLE_GUILE, test "x$USE_GUILE" = "xyes") |
| 68 |
+ [build bindings for guile scheme interpreter])) |
| 69 |
+AS_IF([test "x$enable_guile" = "xyes"], [ |
| 70 |
+ PKG_CHECK_MODULES([GUILE], [guile-1.8]) |
| 71 |
+]) |
| 72 |
+AM_CONDITIONAL(ENABLE_GUILE, test "x$enable_guile" = "xyes") |
| 73 |
|
| 74 |
AC_CONFIG_FILES([Makefile |
| 75 |
starparse-env |
Archives