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 Date: 30-Apr-2009 01:53:33 Branch: HEAD Handle: 2009042923533200 Added files: rpm/ruby .cvsignore Makefile.am Modified files: rpm CHANGES Makefile.am configure.ac devtool.conf Log: - ruby: stub-in the minimal necessary AutoFu to attempt ruby bindings. Summary: Revision Changes Path 1.2960 +1 -0 rpm/CHANGES 2.233 +2 -0 rpm/Makefile.am 2.370 +7 -5 rpm/configure.ac 2.292 +1 -1 rpm/devtool.conf 1.1 +10 -0 rpm/ruby/.cvsignore 1.1 +69 -0 rpm/ruby/Makefile.am ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2959 -r1.2960 CHANGES --- rpm/CHANGES 29 Apr 2009 00:12:57 -0000 1.2959 +++ rpm/CHANGES 29 Apr 2009 23:53:32 -0000 1.2960 @@ -1,5 +1,6 @@ 5.2a4 -> 5.2b1: + - jbj: ruby: stub-in the minimal necessary AutoFu to attempt ruby bindings. - jbj: add AutoFu to detect fallocate(2) and posix_fallocate(3). - jbj: js: add rpmMCExpand() for per-context macro expansion. - jbj: yarn: convert rpmdbMatchIterator to usage mutex with refcounts. @@ . patch -p0 <<'@@ .' Index: rpm/Makefile.am ============================================================================ $ cvs diff -u -r2.232 -r2.233 Makefile.am --- rpm/Makefile.am 20 Apr 2009 15:45:42 -0000 2.232 +++ rpm/Makefile.am 29 Apr 2009 23:53:32 -0000 2.233 @@ -11,6 +11,7 @@ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ js/Makefile.* js/*.[ch] \ + ruby/Makefile.* ruby/*.[ch] \ perl/typemap \ perl/Makefile.PL.in \ perl/t/00.pod.t perl/t/00.pod.coverage.t \ @@ -67,6 +68,7 @@ build \ rpmconstant \ @WITH_JS_SUBDIR@ \ + @WITH_RUBY_SUBDIR@ \ @WITH_PYTHON_SUBDIR@ \ @WITH_PERL_SUBDIR@ \ tools \ @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.369 -r2.370 configure.ac --- rpm/configure.ac 29 Apr 2009 00:12:57 -0000 2.369 +++ rpm/configure.ac 29 Apr 2009 23:53:32 -0000 2.370 @@ -1256,13 +1256,15 @@ [ ], []) -dnl # Ruby embedding +dnl # Ruby +WITH_RUBY_SUBDIR="" RPM_CHECK_LIB( - [Ruby embedding], [rubyembed], + [Ruby], [ruby], [ruby], [ruby_init], [ruby.h], [no,external:none], [], - [ + [ AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby]) ], []) +AC_SUBST(WITH_RUBY_SUBDIR) dnl # Tcl RPM_CHECK_LIB( @@ -1890,8 +1892,8 @@ scripts/macros.python tools/Makefile misc/Makefile doc/Makefile doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile js/Makefile python/Makefile - scripts/rpm.pc lib/rpmversion.h rpmconstant/Makefile tests/Makefile - tests/macros + ruby/Makefile scripts/rpm.pc lib/rpmversion.h rpmconstant/Makefile + tests/Makefile tests/macros ]) dnl # final step: generate output @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.291 -r2.292 devtool.conf --- rpm/devtool.conf 17 Apr 2009 22:42:11 -0000 2.291 +++ rpm/devtool.conf 29 Apr 2009 23:53:32 -0000 2.292 @@ -98,7 +98,7 @@ --with-pythonembed=/usr/lib:/usr/include/python2.5 \ --with-perl \ --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \ - --with-rubyembed=/usr/lib/ruby/1.8/i386-linux \ + --with-ruby=/usr/lib/ruby/1.8/i386-linux \ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ @@ . patch -p0 <<'@@ .' Index: rpm/ruby/.cvsignore ============================================================================ $ cvs diff -u -r0 -r1.1 .cvsignore --- /dev/null 2009-04-30 01:53:00 +0200 +++ .cvsignore 2009-04-30 01:53:32 +0200 @@ -0,0 +1,10 @@ +.deps +Makefile +Makefile.in +.libs +*.gcda +*.gcno +*.la +*.lo +README +trb @@ . patch -p0 <<'@@ .' Index: rpm/ruby/Makefile.am ============================================================================ $ cvs diff -u -r0 -r1.1 Makefile.am --- /dev/null 2009-04-30 01:53:00 +0200 +++ Makefile.am 2009-04-30 01:53:33 +0200 @@ -0,0 +1,69 @@ +# Makefile for rpm library. + +AUTOMAKE_OPTIONS = 1.4 foreign + +LINT = splint + +AM_CPPFLAGS = -I. \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/misc \ + @WITH_DB_CPPFLAGS@ \ + @WITH_FILE_CPPFLAGS@ \ + @WITH_JS_CPPFLAGS@ \ + @WITH_LUA_CPPFLAGS@ \ + @WITH_SYCK_CPPFLAGS@ \ + @WITH_XAR_CPPFLAGS@ \ + @WITH_ZLIB_CPPFLAGS@ + +EXTRA_DIST = + +EXTRA_PROGRAMS = # trb + +RPMMISC_LDADD_COMMON = \ + $(top_builddir)/misc/librpmmisc.la \ + @LTLIBINTL@ + +RPMIO_LDADD_COMMON = \ + $(top_builddir)/rpmio/librpmio.la \ + $(RPMMISC_LDADD_COMMON) + +RPMDB_LDADD_COMMON = \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(RPMIO_LDADD_COMMON) + +RPM_LDADD_COMMON = \ + $(top_builddir)/lib/librpm.la \ + $(RPMDB_LDADD_COMMON) + +RPMBUILD_LDADD_COMMON = \ + $(top_builddir)/build/librpmbuild.la \ + $(RPM_LDADD_COMMON) + +noinst_LTLIBRARIES = rpmrbm.la + +rpmrbm_la_CFLAGS = -fno-strict-aliasing +rpmrbm_la_LDFLAGS = -module -avoid-version +rpmrbm_la_LIBADD = \ + $(top_builddir)/build/librpmbuild.la \ + $(top_builddir)/lib/librpm.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ + $(top_builddir)/misc/librpmmisc.la \ + @LTLIBINTL@ + +noinst_HEADERS = + +rpmrbm_la_SOURCES = + +.PHONY: lint +lint: + $(LINT) $(DEFS) $(INCLUDES) $(rpmrb_la_sources) + +# trb_SOURCES = trb.c rpmrbm.la +# trb_LDADD = rpmrbm.la $(RPM_LDADD_COMMON) + @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org