RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm syck Date: 02-Apr-2009 15:23:50
Branch: HEAD Handle: 2009040213234900
Modified files:
rpm CHANGES
rpm/rpmio lsyck.c
syck/lib syck.h token.c
syck/tests Makefile.am
Log:
- jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc
fiddle-ups.
Summary:
Revision Changes Path
1.2894 +1 -0 rpm/CHANGES
2.2 +6 -2 rpm/rpmio/lsyck.c
1.5 +3 -3 syck/lib/syck.h
1.6 +3 -1 syck/lib/token.c
1.5 +4 -5 syck/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2893 -r1.2894 CHANGES
--- rpm/CHANGES 1 Apr 2009 15:11:06 -0000 1.2893
+++ rpm/CHANGES 2 Apr 2009 13:23:49 -0000 1.2894
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc
fiddle-ups.
- jbj: yaml: add lsyck lua module to parse YAML.
- jbj: yaml: mix syck into the misc melange ...
- jbj: misc: get rid of splitFoo prototypes, bury the last use in
rpmfi.c.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/lsyck.c
============================================================================
$ cvs diff -u -r2.1 -r2.2 lsyck.c
--- rpm/rpmio/lsyck.c 1 Apr 2009 15:11:35 -0000 2.1
+++ rpm/rpmio/lsyck.c 2 Apr 2009 13:23:49 -0000 2.2
@@ -2,11 +2,13 @@
* lsyck.c
*
* $Author: jbj $
- * $Date: 2009/04/01 15:11:35 $
+ * $Date: 2009/04/02 13:23:49 $
*
* Copyright (C) 2005 Zachary P. Landau <kaphe...@divineinvasion.net>
*/
+#if defined(WITH_SYCK)
+
#include <syck.h>
#include <string.h>
#include <stdlib.h>
@@ -260,3 +262,5 @@
luaL_openlib(L, "syck", sycklib, 0);
return 1;
}
+
+#endif /* defined(WITH_SYCK) */
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/syck.h
============================================================================
$ cvs diff -u -r1.4 -r1.5 syck.h
--- syck/lib/syck.h 31 Mar 2009 23:05:59 -0000 1.4
+++ syck/lib/syck.h 2 Apr 2009 13:23:49 -0000 1.5
@@ -624,9 +624,9 @@
int syckparse( void * )
/*...@globals fileSystem @*/
/*...@modifies fileSystem @*/;
-union YYSTYPE;
-int sycklex( union YYSTYPE *sycklval, SyckParser *parser )
- /*...@modifies sycklval, parser @*/;
+/* XXX union YYSTYPE *sycklval has issues on Mac OS X. */
+int sycklex( void *_sycklval, SyckParser *parser )
+ /*...@modifies _sycklval, parser @*/;
#if defined(__cplusplus)
} /* extern "C" { */
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/token.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 token.c
--- syck/lib/token.c 1 Apr 2009 21:07:57 -0000 1.5
+++ syck/lib/token.c 2 Apr 2009 13:23:49 -0000 1.6
@@ -259,9 +259,11 @@
* You really get used to the limited regexp.
* It's really nice to not rely on backtracking and such.
*/
+/* XXX union YYSTYPE *sycklval has issues on Mac OS X. */
int
-sycklex( union YYSTYPE *sycklval, SyckParser *parser )
+sycklex( void * _sycklval, SyckParser *parser )
{
+ union YYSTYPE *sycklval = _sycklval;
switch ( parser->input_type )
{
case syck_yaml_utf8:
@@ .
patch -p0 <<'@@ .'
Index: syck/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.4 -r1.5 Makefile.am
--- syck/tests/Makefile.am 2 Apr 2009 12:42:22 -0000 1.4
+++ syck/tests/Makefile.am 2 Apr 2009 13:23:49 -0000 1.5
@@ -1,15 +1,14 @@
AUTOMAKE_OPTIONS = 1.4 foreign
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
-LDFLAGS = -L$(top_builddir)/lib
TESTS = test-basic test-parse test-yts test-emit
noinst_PROGRAMS = test-basic test-parse test-yts test-emit
test_basic_SOURCES = Basic.c CuTest.c CuTest.h
-test_basic_LDADD = -lsyck
+test_basic_LDADD = -L$(top_builddir)/lib -lsyck
test_parse_SOURCES = Parse.c CuTest.c CuTest.h
-test_parse_LDADD = -lsyck
+test_parse_LDADD = -L$(top_builddir)/lib -lsyck
test_yts_SOURCES = YTS.c CuTest.c CuTest.h
-test_yts_LDADD = -lsyck
+test_yts_LDADD = -L$(top_builddir)/lib -lsyck
test_emit_SOURCES = Emit.c CuTest.c CuTest.h
-test_emit_LDADD = -lsyck
+test_emit_LDADD = -L$(top_builddir)/lib -lsyck
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
