RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 21-Jul-2007 21:16:51
Branch: HEAD Handle: 2007072120164902
Modified files:
rpm CHANGES INSTALL Makefile.am configure.ac
devtool.conf
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am rpmlua.c
Log:
Backout all three recent lua/ subdir related changesets in order
to resurrect the internal Lua.
Summary:
Revision Changes Path
1.1506 +0 -3 rpm/CHANGES
2.37 +9 -5 rpm/INSTALL
2.196 +2 -0 rpm/Makefile.am
2.66 +1 -0 rpm/build/Makefile.am
2.211 +14 -3 rpm/configure.ac
2.58 +4 -2 rpm/devtool.conf
2.161 +1 -0 rpm/lib/Makefile.am
1.27 +1 -0 rpm/misc/Makefile.am
1.75 +1 -0 rpm/python/Makefile.am
1.73 +1 -0 rpm/rpmdb/Makefile.am
1.99 +1 -0 rpm/rpmio/Makefile.am
2.20 +10 -0 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1505 -r1.1506 CHANGES
--- rpm/CHANGES 21 Jul 2007 18:47:59 -0000 1.1505
+++ rpm/CHANGES 21 Jul 2007 19:16:49 -0000 1.1506
@@ -32,12 +32,9 @@
- rse: make --with-path-rpmpopt a colon-separated path to allow "rpmpopt" files be similar to "macros" files
- rse: allow the path to the RPM package sources be overridden via Autoconf option --with-path-sources
- rse: allow the path to the RPM database directory be overridden via Autoconf option --with-path-database
- - rse: drop support for internal lua/ at all to make piece with Automake (as lua/ build-env was not stand-alone)
- - jbj: no longer ship an internal copy of Lua with the RPM distribution
- jbj: refactor rpmio.h include out of header files.
- jbj: patch macro seems sufficiently functional, delete the old "stuff".
- jbj: add stub vectors for rpmio I/O API.
- - jbj: drop support for internal lua.
- jbj: add (preliminary) WR configuration.
- rse: support building against external stock Lua 5.1.2, too
- rse: upgraded the local Lua copy from version 5.0.2 to 5.1.2
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.36 -r2.37 INSTALL
--- rpm/INSTALL 19 Jul 2007 08:46:40 -0000 2.36
+++ rpm/INSTALL 21 Jul 2007 19:16:49 -0000 2.37
@@ -31,10 +31,10 @@
Neon optional 0.26 0.26.4 http://www.webdav.org/neon/
Berkeley-DB [1] optional - 4.5.20 http://www.oracle.com/database/berkeley-db.html
SQLite [1] optional 3.3 3.4.0 http://www.sqlite.org/
-Lua optional 5.1 5.1.2 http://www.lua.org/
-ZLib [2] optional 1.2 1.2.3 http://www.zlib.net/
+Lua [2] optional 5.1 5.1.2 http://www.lua.org/
+ZLib [3] optional 1.2 1.2.3 http://www.zlib.net/
GNU bzip2 optional 1.0 1.0.4 http://www.bzip2.org/
-File/magic [3] optional 4.0 4.21 ftp://ftp.astron.com/pub/file/
+File/magic [4] optional 4.0 4.21 ftp://ftp.astron.com/pub/file/
GNU gettext optional 1.16 1.16.1 http://www.gnu.org/software/gettext/
GNU iconv optional 1.11 1.11 http://www.gnu.org/software/libiconv/
DMalloc optional 5 5.5.2 http://dmalloc.com/
@@ -49,10 +49,14 @@
Building RPM against at least one of Berkeley-DB or SQLite required.
Use modified bundled Berkeley-DB copy, please!
-[2] zlib: Modified ZLib copy bundled with RPM.
+[2] lua: Modified Lua copy bundled with RPM.
+ Building RPM against stock external Lua not recommended
+ as it reduces its RPM-specific functionality.
+
+[3] zlib: Modified ZLib copy bundled with RPM.
Building RPM against stock external Zlib not recommended.
-[3] file: Unmodified File/magic copy bundled with RPM for convenience reasons.
+[4] file: Unmodified File/magic copy bundled with RPM for convenience reasons.
Building RPM against this internal File/magic requires also internal Zlib.
Building RPM against stock external File/magic supported, too.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.195 -r2.196 Makefile.am
--- rpm/Makefile.am 18 Jul 2007 08:26:04 -0000 2.195
+++ rpm/Makefile.am 21 Jul 2007 19:16:49 -0000 2.196
@@ -30,6 +30,7 @@
SUBDIRS += \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
+ @WITH_LUA_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
misc \
rpmio \
@@ -53,6 +54,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
myLDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.65 -r2.66 Makefile.am
--- rpm/build/Makefile.am 16 Jul 2007 08:49:01 -0000 2.65
+++ rpm/build/Makefile.am 21 Jul 2007 19:16:50 -0000 2.66
@@ -16,6 +16,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.210 -r2.211 configure.ac
--- rpm/configure.ac 21 Jul 2007 18:37:02 -0000 2.210
+++ rpm/configure.ac 21 Jul 2007 19:16:49 -0000 2.211
@@ -866,13 +866,24 @@
AC_SUBST(DBAPI)
dnl # Lua
+WITH_LUA_SUBDIR_DEF=""
+WITH_LUA_SUBDIR_LIB=""
RPM_CHECK_LIB(
[Lua], [lua],
[lua], [lua_newstate], [lua.h],
- [no,external:none], [],
- [ AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen)
+ [no,internal:external:none], [lua:local],
+ [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+ AC_CHECK_LIB(dl, dlopen, [ LIBS="-ldl $LIBS"; WITH_LUA_SUBDIR_LIB="-ldl" ])
+ AC_CHECK_FUNC(dlopen, [ WITH_LUA_SUBDIR_DEF="-DLUA_USE_DLOPEN" ])
+ AC_DEFINE(WITH_LUA_INTERNAL, 1, [Define if building with internal Lua])
+ AC_CONFIG_FILES([lua/Makefile])
+ else
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_FUNC(dlopen)
+ fi
], [])
+AC_SUBST(WITH_LUA_SUBDIR_DEF)
+AC_SUBST(WITH_LUA_SUBDIR_LIB)
dnl # DMalloc
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.57 -r2.58 devtool.conf
--- rpm/devtool.conf 21 Jul 2007 16:05:46 -0000 2.57
+++ rpm/devtool.conf 21 Jul 2007 19:16:49 -0000 2.58
@@ -3,7 +3,7 @@
##
%common
- MODULE_NAMES="db zlib file"
+ MODULE_NAMES="db lua zlib file"
MODULE_TAG_DB=""
MODULE_TAG_LUA=""
MODULE_TAG_ZLIB=""
@@ -60,6 +60,7 @@
--with-db=internal \
--with-zlib=internal \
--with-file=internal \
+ --with-lua=internal \
--with-sqlite=external \
--with-beecrypt=external \
--with-neon=external \
@@ -751,7 +752,7 @@
--with-path-sources="$prefix/var/rpm/src" \
--with-bugreport="openpkg-users@openpkg.org" \
--with-beecrypt="$base3rd/bin/$platform/beecrypt-${v_beecrypt}" \
- --with-lua="$base3rd/bin/$platform/lua-${v_lua}/src" \
+ --with-lua="internal" \
--with-file="$base3rd/bin/$platform/file-${v_file}" \
--with-zlib="$base3rd/bin/$platform/zlib-${v_zlib}" \
--with-bzip2="$base3rd/bin/$platform/bzip2-${v_bzip2}" \
@@ -775,6 +776,7 @@
--disable-rpath \
--disable-nls
}
+ # --with-lua="$base3rd/bin/$platform/lua-${v_lua}/src" \
# build RPM
build () {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.160 -r2.161 Makefile.am
--- rpm/lib/Makefile.am 16 Jul 2007 08:49:03 -0000 2.160
+++ rpm/lib/Makefile.am 21 Jul 2007 19:16:50 -0000 2.161
@@ -14,6 +14,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
EXTRA_DIST = getdate.y librpm.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.26 -r1.27 Makefile.am
--- rpm/misc/Makefile.am 16 Jul 2007 08:49:04 -0000 1.26
+++ rpm/misc/Makefile.am 21 Jul 2007 19:16:50 -0000 1.27
@@ -31,6 +31,7 @@
@ALLOCA@ \
@WITH_DB_LDFLAGS@ @WITH_DB_LIBS@ \
@WITH_ZLIB_LDFLAGS@ @WITH_ZLIB_LIBS@ \
+ @WITH_LUA_LDFLAGS@ @WITH_LUA_LIBS@ \
@WITH_FILE_LDFLAGS@ @WITH_FILE_LIBS@
librpmmisc_la_DEPENDENCIES = \
@ALLOCA@
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.74 -r1.75 Makefile.am
--- rpm/python/Makefile.am 16 Jul 2007 08:02:37 -0000 1.74
+++ rpm/python/Makefile.am 21 Jul 2007 19:16:50 -0000 1.75
@@ -20,6 +20,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
-I$(pyincdir)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.72 -r1.73 Makefile.am
--- rpm/rpmdb/Makefile.am 17 Jul 2007 06:09:43 -0000 1.72
+++ rpm/rpmdb/Makefile.am 21 Jul 2007 19:16:51 -0000 1.73
@@ -14,6 +14,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
EXTRA_DIST = db3.c sqlite.c db_emu.h librpmdb.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.98 -r1.99 Makefile.am
--- rpm/rpmio/Makefile.am 17 Jul 2007 15:35:34 -0000 1.98
+++ rpm/rpmio/Makefile.am 21 Jul 2007 19:16:51 -0000 1.99
@@ -18,6 +18,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
RPM_LDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.19 -r2.20 rpmlua.c
--- rpm/rpmio/rpmlua.c 19 Jul 2007 06:38:06 -0000 2.19
+++ rpm/rpmio/rpmlua.c 21 Jul 2007 19:16:51 -0000 2.20
@@ -11,6 +11,11 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifdef WITH_LUA_INTERNAL
+#include <llocal.h>
+#include <lposix.h>
+#include <lrexlib.h>
+#endif
#include <unistd.h>
#include <assert.h>
@@ -62,6 +67,11 @@
{LUA_MATHLIBNAME, luaopen_math},
{LUA_DBLIBNAME, luaopen_debug},
/* local LUA libraries (RPM only) */
+#ifdef WITH_LUA_INTERNAL
+ {"local", luaopen_local},
+ {"posix", luaopen_posix},
+ {"rex", luaopen_rex},
+#endif
{"rpm", luaopen_rpm},
{NULL, NULL},
};
@@ .
Received on Sat Jul 21 21:16:51 2007