RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm lua Date: 13-Apr-2009 20:31:55
Branch: HEAD Handle: 2009041318315203
Modified files:
lua Makefile.am
rpm CHANGES Makefile.am configure.ac
rpm/build Makefile.am
rpm/misc Makefile.am librpmmisc.vers
rpm/rpmconstant Makefile.am
rpm/rpmio Makefile.am
Log:
forward port all build infrastructure fixes from RPM 5.1
Summary:
Revision Changes Path
1.35 +3 -3 lua/Makefile.am
1.2923 +1 -0 rpm/CHANGES
2.230 +3 -2 rpm/Makefile.am
2.75 +1 -0 rpm/build/Makefile.am
2.360 +10 -1 rpm/configure.ac
1.45 +4 -2 rpm/misc/Makefile.am
1.17 +65 -0 rpm/misc/librpmmisc.vers
1.11 +2 -1 rpm/rpmconstant/Makefile.am
1.223 +1 -2 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/Makefile.am
============================================================================
$ cvs diff -u -r1.34 -r1.35 Makefile.am
--- lua/Makefile.am 31 Mar 2009 17:37:46 -0000 1.34
+++ lua/Makefile.am 13 Apr 2009 18:31:54 -0000 1.35
@@ -11,7 +11,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir)/local \
- -I$(builddir)/local
+ -I$(builddir)/local \
+ @WITH_PCRE_CPPFLAGS@
if USE_LUA_CHKCONFIG
AM_CPPFLAGS += \
-I$(srcdir)/chkconfig \
@@ -36,8 +37,7 @@
bin2c_LDADD =
liblua_la_SOURCES =
-liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX
-liblua_la_LDFLAGS = $(top_builddir)/misc/librpmmisc.la
+liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@
if USE_LUA_CRYPTO
liblua_la_CFLAGS += \
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2922 -r1.2923 CHANGES
--- rpm/CHANGES 13 Apr 2009 18:07:30 -0000 1.2922
+++ rpm/CHANGES 13 Apr 2009 18:31:52 -0000 1.2923
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - rse: forward port all build infrastructure fixes from RPM 5.1
- rse: eliminate compile-time warnings introduced with recent embedded
language support
- afb: rename --with-ruby to --with-rubyembed, to match Perl/Python.
- jbj: perl: attach stdout to macro expansion buffer with IO::String.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.229 -r2.230 Makefile.am
--- rpm/Makefile.am 1 Apr 2009 00:07:36 -0000 2.229
+++ rpm/Makefile.am 13 Apr 2009 18:31:52 -0000 2.230
@@ -53,13 +53,13 @@
SUBDIRS += \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
- @WITH_FILE_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
+ @WITH_LUA_SUBDIR@ \
+ @WITH_FILE_SUBDIR@ \
@WITH_SYCK_SUBDIR@ \
@WITH_XAR_SUBDIR@ \
@WITH_XZ_SUBDIR@ \
misc \
- @WITH_LUA_SUBDIR@ \
rpmio \
rpmdb \
lib \
@@ -86,6 +86,7 @@
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
+ @WITH_PCRE_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
@WITH_XZ_CPPFLAGS@
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.74 -r2.75 Makefile.am
--- rpm/build/Makefile.am 11 Oct 2008 23:58:00 -0000 2.74
+++ rpm/build/Makefile.am 13 Apr 2009 18:31:54 -0000 2.75
@@ -21,6 +21,7 @@
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
+ @WITH_PCRE_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.359 -r2.360 configure.ac
--- rpm/configure.ac 13 Apr 2009 16:32:42 -0000 2.359
+++ rpm/configure.ac 13 Apr 2009 18:31:52 -0000 2.360
@@ -1307,16 +1307,25 @@
AM_CONDITIONAL(USE_LUA_SOCKET, [ test ".$USE_LUA_SOCKET" = .yes ])
dnl # PCRE
+dnl # use cases:
+dnl # - RPM under WITH_PCRE uses <pcre.h>+libpcre in addition to <regex.h>
+dnl # - RPM under WITH_PCRE+WITH_PCRE_POSIX uses <pcreposix.h>+libpcreposix
instead of <regex.h>
+dnl # - RPM/Lua under LUA_USE_PCRE uses <pcre.h>+libpcre in addition to
<regex.h>
+dnl # attention:
+dnl # - In the locally bundled PCRE all libpcre objects are embedded into
libpcreposix
+dnl # because of s/lib/noinst/ changes in pcre/Makefile.am. Here we have
to link
+dnl # against libpcreposix only!
WITH_PCRE_INTERNAL=false
RPM_CHECK_LIB(
[PCRE], [pcre],
- [pcreposix pcre], [pcre_compile], [pcre.h],
+ [pcre], [pcre_compile], [pcre.h],
[yes,internal:external:none], [pcre],
[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_PCRE_INTERNAL=true
AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have <pcre.h>])
AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the 'pcre'
library (-lpcre).])
AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is
available])
+ WITH_PCRE_LIBS="-lpcreposix" # override, not prepend! (see attention
above)
AC_SUBST(WITH_PCRE_LIBS)
else
dnl # make sure PCRE POSIX API can be really _USED_ by RPM
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.44 -r1.45 Makefile.am
--- rpm/misc/Makefile.am 1 Apr 2009 00:07:36 -0000 1.44
+++ rpm/misc/Makefile.am 13 Apr 2009 18:31:55 -0000 1.45
@@ -34,6 +34,7 @@
@WITH_DB_LDFLAGS@ \
@WITH_ZLIB_LDFLAGS@ \
@WITH_XZ_LDFLAGS@ \
+ @WITH_LUA_LDFLAGS@ \
@WITH_FILE_LDFLAGS@ \
@WITH_PCRE_LDFLAGS@ \
@WITH_SYCK_LDFLAGS@ \
@@ -43,6 +44,7 @@
@WITH_DB_LIBS@ \
@WITH_ZLIB_LIBS@ \
@WITH_XZ_LIBS@ \
+ @WITH_LUA_LIBS@ \
@WITH_FILE_LIBS@ \
@WITH_PCRE_LIBS@ \
@WITH_SYCK_LIBS@ \
@@ -53,8 +55,8 @@
endif
librpmmisc_la_DEPENDENCIES = \
@ALLOCA@
-#librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES)
-# $(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS)
$(librpmmisc_la_LIBADD)
+librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES)
+ $(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS)
$(librpmmisc_la_LIBADD)
install-data-hook:
if !ENABLE_BUILD_LAFILES
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.16 -r1.17 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 1 Apr 2009 15:11:35 -0000 1.16
+++ rpm/misc/librpmmisc.vers 13 Apr 2009 18:31:55 -0000 1.17
@@ -6,6 +6,71 @@
db_env_set_func_fsync_rpmdb;
db_strerror_rpmdb;
db_create_rpmdb;
+ lua_call;
+ lua_close;
+ lua_concat;
+ lua_createtable;
+ lua_getfield;
+ lua_gettop;
+ lua_isnumber;
+ lua_isstring;
+ luaL_argerror;
+ luaL_checklstring;
+ luaL_error;
+ luaL_loadbuffer;
+ luaL_loadfile;
+ luaL_newstate;
+ lua_newthread;
+ luaL_openlib;
+ luaL_ref;
+ luaL_unref;
+ lua_newuserdata;
+ lua_next;
+ lua_objlen;
+ luaopen_base;
+ luaopen_crypto;
+ luaopen_debug;
+ luaopen_io;
+ luaopen_local;
+ luaopen_math;
+ luaopen_os;
+ luaopen_lxp;
+ luaopen_package;
+ luaopen_posix;
+ luaopen_rex_pcre;
+ luaopen_rex_posix;
+ luaopen_socket_core;
+ luaopen_string;
+ luaopen_table;
+ luaopen_uuid;
+ luaopen_wrs;
+ lua_pcall;
+ lua_pushboolean;
+ lua_pushcclosure;
+ lua_pushfstring;
+ lua_pushlightuserdata;
+ lua_pushlstring;
+ lua_pushnil;
+ lua_pushnumber;
+ lua_pushstring;
+ lua_pushvalue;
+ lua_rawget;
+ lua_rawgeti;
+ lua_rawset;
+ lua_rawseti;
+ lua_remove;
+ lua_settable;
+ lua_settop;
+ lua_toboolean;
+ lua_tolstring;
+ lua_tonumber;
+ lua_touserdata;
+ lua_type;
+ lua_xmove;
+ luaL_addlstring;
+ luaL_buffinit;
+ luaL_pushresult;
+ luaL_typerror;
lzma_alone_encoder;
lzma_auto_decoder;
lzma_code;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.10 -r1.11 Makefile.am
--- rpm/rpmconstant/Makefile.am 13 Apr 2008 18:50:33 -0000 1.10
+++ rpm/rpmconstant/Makefile.am 13 Apr 2009 18:31:54 -0000 1.11
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.10 2008/04/13 18:50:33 afb Exp $
+# $Id: Makefile.am,v 1.11 2009/04/13 18:31:54 rse Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -15,6 +15,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
+ @WITH_PCRE_CPPFLAGS@ \
@WITH_DB_CPPFLAGS@
bin_PROGRAMS = rpmconstant
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.222 -r1.223 Makefile.am
--- rpm/rpmio/Makefile.am 8 Apr 2009 17:31:56 -0000 1.222
+++ rpm/rpmio/Makefile.am 13 Apr 2009 18:31:54 -0000 1.223
@@ -89,8 +89,7 @@
endif
librpmio_la_LIBADD =
if ENABLE_BUILD_INTLIBDEP
-librpmio_la_LDFLAGS += @WITH_LUA_LDFLAGS@
-librpmio_la_LIBADD += @WITH_LUA_LIBS@ \
+librpmio_la_LIBADD +=
$(top_builddir)/misc/librpmmisc.la
endif
if ENABLE_BUILD_MAXEXTLIBDEP
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
