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: 01-Apr-2009 02:07:37
Branch: HEAD Handle: 2009040100073601
Added files:
syck autogen.sh
Modified files:
rpm CHANGES Makefile.am autogen.sh configure.ac
devtool.conf
rpm/misc Makefile.am
syck .cvsignore system.h
syck/lib .cvsignore Makefile.am
Log:
- jbj: yaml: mix syck into the misc melange ...
Summary:
Revision Changes Path
1.2892 +1 -0 rpm/CHANGES
2.229 +1 -0 rpm/Makefile.am
2.102 +3 -0 rpm/autogen.sh
2.352 +10 -0 rpm/configure.ac
2.270 +2 -0 rpm/devtool.conf
1.44 +2 -0 rpm/misc/Makefile.am
1.2 +1 -0 syck/.cvsignore
1.1 +51 -0 syck/autogen.sh
1.2 +3 -0 syck/lib/.cvsignore
1.5 +4 -2 syck/lib/Makefile.am
1.2 +2 -0 syck/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2891 -r1.2892 CHANGES
--- rpm/CHANGES 31 Mar 2009 19:03:26 -0000 1.2891
+++ rpm/CHANGES 1 Apr 2009 00:07:36 -0000 1.2892
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - jbj: yaml: mix syck into the misc melange ...
- jbj: misc: get rid of splitFoo prototypes, bury the last use in
rpmfi.c.
- jbj: PCRE in -lrpmmisc, LUA in -lrpmio linking -lrpmmisc, instead.
- jbj: fix: --noscripts/--nofdigests/--nocontexts need to use popt
callback.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.228 -r2.229 Makefile.am
--- rpm/Makefile.am 31 Mar 2009 17:37:45 -0000 2.228
+++ rpm/Makefile.am 1 Apr 2009 00:07:36 -0000 2.229
@@ -55,6 +55,7 @@
@WITH_ZLIB_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
+ @WITH_SYCK_SUBDIR@ \
@WITH_XAR_SUBDIR@ \
@WITH_XZ_SUBDIR@ \
misc \
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
============================================================================
$ cvs diff -u -r2.101 -r2.102 autogen.sh
--- rpm/autogen.sh 15 Feb 2009 13:55:30 -0000 2.101
+++ rpm/autogen.sh 1 Apr 2009 00:07:36 -0000 2.102
@@ -49,6 +49,9 @@
echo "===> file"
( cd file && sh ./autogen.sh --noconfigure "$@" )
echo "<=== file"
+echo "===> syck"
+( cd syck && sh ./autogen.sh --noconfigure "$@" )
+echo "<=== syck"
echo "===> xar"
( cd xar && sh ./autogen.sh --noconfigure "$@" )
echo "<=== xar"
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.351 -r2.352 configure.ac
--- rpm/configure.ac 31 Mar 2009 17:37:45 -0000 2.351
+++ rpm/configure.ac 1 Apr 2009 00:07:36 -0000 2.352
@@ -1324,6 +1324,16 @@
fi
], [])
+dnl # Syck
+RPM_CHECK_LIB(
+ [Syck], [syck],
+ [syck], [syckparse], [syck.h],
+ [no,internal:external:none], [syck:lib:lib],
+ [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+ AC_DEFINE(HAVE_SYCK_H, 1, [Have <syck.h> header])
+ fi
+ ], [])
+
dnl # XAR
RPM_CHECK_LIB(
[XAR], [xar],
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.269 -r2.270 devtool.conf
--- rpm/devtool.conf 31 Mar 2009 17:37:45 -0000 2.269
+++ rpm/devtool.conf 1 Apr 2009 00:07:36 -0000 2.270
@@ -10,6 +10,7 @@
MODULE_TAG_XAR=""
MODULE_TAG_XZ=""
MODULE_TAG_PCRE=""
+ MODULE_TAG_SYCK=""
%checkout
for name in $MODULE_NAMES "$@"; do
@@ -76,6 +77,7 @@
--with-file=internal \
--with-lua=internal \
--with-sqlite=external \
+ --with-syck=internal \
--with-beecrypt=external \
--with-openssl=external \
--with-nss=external \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.43 -r1.44 Makefile.am
--- rpm/misc/Makefile.am 31 Mar 2009 17:37:46 -0000 1.43
+++ rpm/misc/Makefile.am 1 Apr 2009 00:07:36 -0000 1.44
@@ -36,6 +36,7 @@
@WITH_XZ_LDFLAGS@ \
@WITH_FILE_LDFLAGS@ \
@WITH_PCRE_LDFLAGS@ \
+ @WITH_SYCK_LDFLAGS@ \
@WITH_XAR_LDFLAGS@
librpmmisc_la_LIBADD = \
@ALLOCA@ \
@@ -44,6 +45,7 @@
@WITH_XZ_LIBS@ \
@WITH_FILE_LIBS@ \
@WITH_PCRE_LIBS@ \
+ @WITH_SYCK_LIBS@ \
@WITH_XAR_LIBS@
if ENABLE_BUILD_EXTLIBDEP
librpmmisc_la_LDFLAGS += $(LDFLAGS)
@@ .
patch -p0 <<'@@ .'
Index: syck/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.2 .cvsignore
--- syck/.cvsignore 17 Oct 2008 19:41:38 -0000 1.1
+++ syck/.cvsignore 1 Apr 2009 00:07:37 -0000 1.2
@@ -10,6 +10,7 @@
config.log
config.status
configure
+INSTALL
libtool
Makefile
Makefile.in
@@ .
patch -p0 <<'@@ .'
Index: syck/autogen.sh
============================================================================
$ cvs diff -u -r0 -r1.1 autogen.sh
--- /dev/null 2009-04-01 02:07:01 +0200
+++ autogen.sh 2009-04-01 02:07:37 +0200
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# configure the requirements
+AMV="automake (GNU automake) 1.10"
+ACV="autoconf (GNU Autoconf) 2.63"
+LTV="libtoolize (GNU libtool) 2.2.6"
+GTT="gettextize (GNU gettext-tools) 0.17"
+USAGE="
+To build RPM from plain CVS sources the following
+installed developer tools are mandatory:
+ $AMV
+ $ACV
+ $LTV
+ $GTT
+"
+
+# wrapper for running GNU libtool's libtoolize(1)
+libtoolize () {
+ _libtoolize=`which glibtoolize 2>/dev/null`
+ _libtoolize_args="$*"
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize=`which libtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize="libtoolize" ;;
+ esac
+ ;;
+ esac
+ _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e
's;^[^0-9]*;;'`"
+ case "$_libtoolize_version" in
+ 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;'
-e 's;--quiet;;' -e 's;--install;;'` ;;
+ esac
+ eval $_libtoolize $_libtoolize_args
+}
+
+# requirements sanity check
+[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
+[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
+[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
+[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`"
!= "$GTT" ] && echo "$USAGE" # && exit 1
+
+echo "---> generate files via GNU libtool (libtoolize)"
+libtoolize --quiet --copy --force --install
+echo "---> generate files via GNU autoconf (aclocal, autoheader)"
+aclocal
+autoheader
+echo "---> generate files via GNU automake (automake)"
+automake -Wall -Wno-override -a -c
+echo "---> generate files via GNU autoconf (autoconf)"
+autoconf
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.2 .cvsignore
--- syck/lib/.cvsignore 31 Mar 2009 23:05:59 -0000 1.1
+++ syck/lib/.cvsignore 1 Apr 2009 00:07:37 -0000 1.2
@@ -1,4 +1,7 @@
.deps
+.libs
+*.lo
+*.la
Makefile
Makefile.in
gram.c
@@ .
patch -p0 <<'@@ .'
Index: syck/lib/Makefile.am
============================================================================
$ cvs diff -u -r1.4 -r1.5 Makefile.am
--- syck/lib/Makefile.am 31 Mar 2009 23:05:59 -0000 1.4
+++ syck/lib/Makefile.am 1 Apr 2009 00:07:37 -0000 1.5
@@ -5,8 +5,10 @@
YACC = bison
AM_YFLAGS = -d -t -v -p syck
-lib_LTLIBRARIES = libsyck.la
-include_HEADERS = syck.h syck_st.h
+#lib_LTLIBRARIES = libsyck.la
+#include_HEADERS = syck.h syck_st.h
+noinst_LTLIBRARIES = libsyck.la
+noinst_HEADERS = syck.h syck_st.h
libsyck_la_SOURCES = \
emitter.c \
@@ .
patch -p0 <<'@@ .'
Index: syck/system.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 system.h
--- syck/system.h 31 Mar 2009 23:05:58 -0000 1.1
+++ syck/system.h 1 Apr 2009 00:07:37 -0000 1.2
@@ -22,6 +22,8 @@
#include <unistd.h>
#endif
+#include <ctype.h>
+
/*...@-incondefs@*/
/*...@mayexit@*/ /*...@only@*/ /*...@out@*/ /*...@unused@*/
void * xmalloc (size_t size)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
