OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Dec-2006 08:35:29
Branch: HEAD Handle: 2006121107352800
Modified files:
openpkg-src/lua lua.patch lua.spec
Log:
fix build flag passing and use it to add optional readline support
Summary:
Revision Changes Path
1.2 +37 -4 openpkg-src/lua/lua.patch
1.17 +20 -6 openpkg-src/lua/lua.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lua/lua.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 lua.patch
--- openpkg-src/lua/lua.patch 17 Jun 2006 20:46:11 -0000 1.1
+++ openpkg-src/lua/lua.patch 11 Dec 2006 07:35:28 -0000 1.2
@@ -1,18 +1,51 @@
Index: src/Makefile
--- src/Makefile.orig 2006-03-22 01:41:49 +0100
-+++ src/Makefile 2006-06-17 22:42:28 +0200
-@@ -92,7 +92,7 @@
++++ src/Makefile 2006-12-11 08:32:12 +0100
+@@ -14,9 +14,9 @@
+ RM= rm -f
+ LIBS= -lm $(MYLIBS)
+
+-MYCFLAGS=
+-MYLDFLAGS=
+-MYLIBS=
++MYCFLAGS ?=
++MYLDFLAGS ?=
++MYLIBS ?=
+
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE
=========
+
+@@ -86,13 +86,13 @@
+ $(MAKE) all MYCFLAGS=-DLUA_ANSI
+
+ bsd:
+- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
++ $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_POSIX -DLUA_USE_DLOPEN"
MYLIBS="$(MYLIBS) -Wl,-E"
+
+ generic:
$(MAKE) all MYCFLAGS=
linux:
- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline
-lhistory -lncurses"
-+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
++ $(MAKE) all MYCFLAGS="$(MYCFLAGS -DLUA_USE_LINUX" MYLIBS="$(MYLIBS)
-Wl,-E -ldl"
macosx:
$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+@@ -105,10 +105,10 @@
+ "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
+
+ posix:
+- $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
++ $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_POSIX"
+
+ solaris:
+- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
++ $(MAKE) all MYCFLAGS="$(MYCFLAGS) -DLUA_USE_POSIX -DLUA_USE_DLOPEN"
MYLIBS="$(MYLIBS) -ldl"
+
+ # list targets that do not create files (but not all makes understand
.PHONY)
+ .PHONY: all $(PLATS) default o a clean depend echo none
Index: src/luaconf.h
--- src/luaconf.h.orig 2006-04-10 20:27:23 +0200
-+++ src/luaconf.h 2006-06-17 22:42:15 +0200
++++ src/luaconf.h 2006-12-11 08:28:55 +0100
@@ -36,7 +36,6 @@
#if defined(LUA_USE_LINUX)
#define LUA_USE_POSIX
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lua/lua.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 lua.spec
--- openpkg-src/lua/lua.spec 13 Oct 2006 17:29:46 -0000 1.16
+++ openpkg-src/lua/lua.spec 11 Dec 2006 07:35:28 -0000 1.17
@@ -33,7 +33,10 @@
Group: Language
License: MIT
Version: 5.1.1
-Release: 20061013
+Release: 20061211
+
+# package options
+%option with_readline no
# list of sources
Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz
@@ -44,6 +47,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_readline}" == "yes"
+BuildPreReq: readline, pkgconfig
+PreReq: readline
+%endif
AutoReq: no
AutoReqProv: no
@@ -75,9 +82,16 @@
*-freebsd* ) platform="bsd" ;;
*-sunos* ) platform="solaris" ;;
esac
+ export MYCFLAGS=""
+ export MYLIBS=""
+%if "%{with_readline}" == "yes"
+ MYCFLAGS="$MYCFLAGS -DLUA_USE_READLINE `pkg-config readline --cflags`"
+ MYLIBS="$MYLIBS `pkg-config readline --libs`"
+%endif
%{l_make} %{l_mflags -O} \
- CC="%{l_cc}" \
- MYCFLAGS="%{l_cflags -O}" \
+ CC="%{l_cc} %{l_cflags -O}" \
+ MYCFLAGS="$MYCFLAGS" \
+ MYLIBS="$MYLIBS" \
INSTALL_TOP="%{l_prefix}" \
INSTALL_INC="\$(INSTALL_ROOT)/include/lua" \
$platform
@@ -87,11 +101,11 @@
%{l_make} %{l_mflags} install \
INSTALL_TOP=$RPM_BUILD_ROOT%{l_prefix}
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/share/lua
%{l_shtool} install -c -m 644 \
doc/manual.html $RPM_BUILD_ROOT%{l_prefix}/share/lua/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%doc %{l_prefix}/share/lua/manual.html'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
