rpms/lua
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added c++ library; pkgconfig files and other improvements [release 5.4.6-2mamba;Fri Feb 09 2024]

Browse Source
This commit is contained in:
Silvan Calarco 2024-02-09 19:53:34 +01:00
parent f70e072c74
commit 3d7a41b1f4
4 changed files with 79 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua-5.1.2-luapc.patch
View File

@ -1,11 +0,0 @@
--- lua-5.1.2/etc/lua.pc 2007-03-23 20:58:49.000000000 +0100
+++ lua-5.1.2/etc/lua.pc.prefix 2007-10-25 11:47:35.000000000 +0200
@@ -8,7 +8,7 @@
R= 5.1.2
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr/local
+prefix= /usr
INSTALL_BIN= ${prefix}/bin
INSTALL_INC= ${prefix}/include
INSTALL_LIB= ${prefix}/lib

12
lua-5.1.4-cross_compile.patch
View File

@ -1,12 +0,0 @@
diff -Nru lua-5.1.4.orig//src/Makefile lua-5.1.4/src/Makefile
--- lua-5.1.4.orig//src/Makefile 2010-06-16 20:13:28.242643022 +0200
+++ lua-5.1.4/src/Makefile 2010-06-16 20:14:12.930892707 +0200
@@ -53,7 +53,7 @@
$(RANLIB) $@
$(LUA_SO): $(CORE_O) $(LIB_O)
- gcc -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
+ $(CC) -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
rm -f liblua.so
ln -s $@ liblua.so

53
lua-5.2.0-dynlib.patch
View File

@ -1,53 +0,0 @@
diff -ru lua-5.1.2/Makefile lua-5.1.2-om/Makefile
--- lua-5.1.2/Makefile 2007-10-24 10:12:17.000000000 +0200
+++ lua-5.1.2-om/Makefile 2007-10-24 10:16:22.000000000 +0200
@@ -53,7 +53,7 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) V=$(V) $@
test: dummy
src/lua test/hello.lua
diff -ru lua-5.1.2/src/Makefile lua-5.1.2-om/src/Makefile
--- lua-5.1.2/src/Makefile 2007-03-25 16:49:23.000000000 +0200
+++ lua-5.1.2-om/src/Makefile 2007-10-24 10:15:52.000000000 +0200
@@ -8,7 +8,7 @@
PLAT= none
CC= gcc
-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+CFLAGS= -O2 -Wall -fPIC -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) $(RPM_OPT_FLAGS)
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
@@ -22,6 +22,7 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+LUA_SO= liblua.so.$(V)
LUA_A= liblua.a
CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
@@ -36,7 +37,7 @@
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
ALL_A= $(LUA_A)
# Targets start here.
@@ -51,6 +52,11 @@
$(AR) $@ $?
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
+ gcc -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS) $(LUA_O)
+ rm -f liblua.so
+ ln -s $@ liblua.so
+
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

134
lua.spec
View File

@ -1,26 +1,23 @@
%define libname liblua
%define libmajver %(echo %version | cut -d. -f 1-2) %define libmajver %(echo %version | cut -d. -f 1-2)
Name: lua Name: lua
Version: 5.4.6 Version: 5.4.6
Release: 1mamba Release: 2mamba
Summary: A powerful light-weight and embeddable programming language Summary: A powerful light-weight and embeddable programming language
Group: Applications/Development Group: Applications/Development
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Aleph0 <aleph0@openmamba.org> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.lua.org URL: https://www.lua.org/
Source: http://www.lua.org/ftp/lua-%{version}.tar.gz Source: http://www.lua.org/ftp/lua-%{version}.tar.gz
Patch0: %{name}-5.2.0-dynlib.patch
Patch1: %{name}-5.1.2-luapc.patch
Patch2: %{name}-5.1.4-cross_compile.patch
Patch3: lua-5.4.3-shared_library.patch Patch3: lua-5.4.3-shared_library.patch
License: MIT License: MIT
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libreadline-devel BuildRequires: libreadline-devel
BuildRequires: libtermcap-devel BuildRequires: libstdc++6-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description %description
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
@ -32,74 +29,69 @@ For example, although Lua is not a pure object-oriented language, it does provid
Lua's meta-mechanisms bring an economy of concepts and keep the language small, while allowing the semantics to be extended in unconventional ways. Lua's meta-mechanisms bring an economy of concepts and keep the language small, while allowing the semantics to be extended in unconventional ways.
Extensible semantics is a distinguishing feature of Lua. Extensible semantics is a distinguishing feature of Lua.
%package devel %package -n lib%{name}
Group: Development/Libraries
Summary: Development files for %{name}
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description devel
Lua is a powerful light-weight programming language designed for extending applications.
Lua is also frequently used as a general-purpose, stand-alone language.
This package contains files needed for embedding lua into your application.
%package -n %{libname}
Summary: Lua is a powerful, light-weight programming language Summary: Lua is a powerful, light-weight programming language
Group: System/Libraries Group: System/Libraries
Provides: liblua.so
#Provides: liblualib.so
%description -n %{libname} %description -n lib%{name}
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
This package contains the dynamic libraries provided by lua scripting language. This package contains the dynamic libraries provided by lua scripting language.
%package -n %{libname}-devel %package -n lib%{name}-devel
Summary: Static libraries and headers for lua Summary: Static libraries and headers for lua
Group: Development/Libraries Group: Development/Libraries
Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: lua-devel = %{?epoch:%epoch:}%{version}-%{release} Provides: lua-devel = %{?epoch:%epoch:}%{version}-%{release}
Obsoletes: lua-devel < 5.4.3 Obsoletes: lua-devel < 5.4.3
%description -n %{libname}-devel %description -n lib%{name}-devel
Lua is a powerful light-weight programming language designed for extending applications. Lua is a powerful light-weight programming language designed for extending applications.
This package contains static libraries and header files need for development. This package contains static libraries and header files needed for development.
%debug_package %debug_package
%prep %prep
%setup -q %setup -q -c
#%patch0 -p1 -b .dynlib cd lua-%{version}
#%patch1 -p1 -b .luapc
#%patch2 -p1
%patch 3 -p1 -b .shared_library %patch 3 -p1 -b .shared_library
cd ..
cp -r lua-%{version} lua++-%{version}
%build %build
%make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS -ltermcap" linux-readline cd lua-%{version}
#%make -j1 -C src \ %make MYCFLAGS="%{optflags} -fPIC" MYLDFLAGS="" linux-readline
# CC=%{_host}-gcc \
# MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" -DLUA_USE_LINUX" \ cd ../lua++-%{version}
# make MYCFLAGS="$CFLAGS -fPIC MYLDFLAGS="$LDFLAGS" linux %make MYCFLAGS="%{optflags} -fPIC" MYLDFLAGS="" CC=g++ LUA_A=liblua++.a LUA_SO=liblua++.so linux-readline
# MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{libmajver} all
%install %install
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
cd lua-%{version}
%makeinstall \ %makeinstall \
TO_LIB="liblua.so liblua.so.%{libmajver} liblua.so.%{version}" \
INSTALL_DATA='cp -d' \
INSTALL_TOP=%{buildroot}%{_prefix} \ INSTALL_TOP=%{buildroot}%{_prefix} \
INSTALL_INC=%{buildroot}%{_includedir}/lua%{libmajver} \ INSTALL_INC=%{buildroot}%{_includedir}/lua%{libmajver} \
INSTALL_LIB=%{buildroot}%{_libdir} \ INSTALL_LIB=%{buildroot}%{_libdir} \
INSTALL_MAN=%{buildroot}%{_mandir}/man1 INSTALL_MAN=%{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_datadir}/lua ln -sf lua %{buildroot}%{_bindir}/lua-%{libmajver}
#install -m 644 test/*.lua %{buildroot}%{_datadir}/lua ln -sf luac %{buildroot}%{_bindir}/luac-%{libmajver}
ln -sf liblua.so.%{version} %{buildroot}%{_libdir}/liblua%{libmajver}.so
ln -sf liblua.so.%{libmajver} %{buildroot}%{_libdir}/liblua.so
install -d %{buildroot}%{_libdir}
install -m 755 src/liblua.so.%{libmajver} %{buildroot}%{_libdir}
ln -s liblua.so.%{libmajver} %{buildroot}%{_libdir}/liblua.so
#install -D -m644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc
install -d %{buildroot}%{_libdir}/pkgconfig/ install -d %{buildroot}%{_libdir}/pkgconfig/
echo "\ echo "\
prefix=%{_prefix} prefix=%{_prefix}
INSTALL_BIN=%{_bindir}
INSTALL_INC=%{_includedir}
INSTALL_LIB=%{_libdir}
INSTALL_MAN=%{_mandir}/man1
INSTALL_LMOD=%{_datadir}/lua/%{libmajver}
INSTALL_CMOD=%{_libdir}/lua/%{libmajver}
exec_prefix=%{_exec_prefix} exec_prefix=%{_exec_prefix}
libdir=%{_libdir} libdir=%{_libdir}
includedir=%{_includedir}/lua%{libmajver} includedir=%{_includedir}/lua%{libmajver}
@ -108,40 +100,72 @@ Name: Lua
Description: An Extensible Extension Language Description: An Extensible Extension Language
Version: 5.4.6 Version: 5.4.6
Requires: Requires:
Libs: -L%{_libdir} -llua -lm -lreadline Libs: -L%{_libdir} -llua -lm
Cflags: -I%{_includedir}/lua%{libmajver}" > \ Cflags: -I%{_includedir}/lua%{libmajver}" > \
%{buildroot}%{_libdir}/pkgconfig/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua%{libmajver}.pc
ln -s lua%{libmajver}.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc
ln -s lua%{libmajver}.pc %{buildroot}%{_libdir}/pkgconfig/lua-%{libmajver}.pc
cd ../lua++-%{version}
%makeinstall \
TO_LIB="liblua++.so liblua++.so.%{libmajver} liblua++.so.%{version}" \
INSTALL_DATA='cp -d' \
INSTALL_BIN=null \
INSTALL_INC=null \
INSTALL_MAN=../null \
INSTALL_TOP=%{buildroot}%{_prefix} \
INSTALL_LIB=%{buildroot}%{_libdir} \
ln -sf liblua++.so.%{version} %{buildroot}%{_libdir}/liblua++%{libmajver}.so
cp %{buildroot}%{_libdir}/pkgconfig/lua%{libmajver}.pc %{buildroot}%{_libdir}/pkgconfig/lua++%{libmajver}.pc
sed -i "s|-llua|-llua++|g" %{buildroot}%{_libdir}/pkgconfig/lua++%{libmajver}.pc
ln -s lua++%{libmajver}.pc %{buildroot}%{_libdir}/pkgconfig/lua++.pc
ln -s lua++%{libmajver}.pc %{buildroot}%{_libdir}/pkgconfig/lua++-%{libmajver}.pc
%clean %clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
%post -n %{libname} -p /sbin/ldconfig %post -n lib%{name} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/lua %{_bindir}/lua
%{_bindir}/luac %{_bindir}/luac
%dir %{_datadir}/lua %{_bindir}/lua-%{libmajver}
#%{_datadir}/lua/*.lua %{_bindir}/luac-%{libmajver}
%{_mandir}/man1/lua.* %{_mandir}/man1/lua.*
%{_mandir}/man1/luac.* %{_mandir}/man1/luac.*
%files -n %{libname} %files -n lib%{name}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/liblua.so.* %{_libdir}/liblua.so.*
%{_libdir}/liblua++.so.*
%files -n %{libname}-devel %files -n lib%{name}-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_includedir}/lua%{libmajver} %dir %{_includedir}/lua%{libmajver}
%{_includedir}/lua%{libmajver}/*.h %{_includedir}/lua%{libmajver}/*.h
%{_includedir}/lua%{libmajver}/*.hpp %{_includedir}/lua%{libmajver}/*.hpp
%{_libdir}/liblua.a #%{_libdir}/liblua.a
%{_libdir}/liblua.so %{_libdir}/liblua.so
%{_libdir}/liblua%{libmajver}.so
%{_libdir}/liblua++.so
%{_libdir}/liblua++%{libmajver}.so
%{_libdir}/pkgconfig/lua.pc %{_libdir}/pkgconfig/lua.pc
%doc README doc/*.html doc/*.css doc/*.gif doc/*.png %{_libdir}/pkgconfig/lua-%{libmajver}.pc
%{_libdir}/pkgconfig/lua%{libmajver}.pc
%{_libdir}/pkgconfig/lua++.pc
%{_libdir}/pkgconfig/lua++-%{libmajver}.pc
%{_libdir}/pkgconfig/lua++%{libmajver}.pc
#%doc README doc/*.html doc/*.css doc/*.gif doc/*.png
%changelog %changelog
* Fri Feb 09 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 5.4.6-2mamba
- added c++ library; pkgconfig files and other improvements
* Mon May 15 2023 Automatic Build System <autodist@mambasoft.it> 5.4.6-1mamba * Mon May 15 2023 Automatic Build System <autodist@mambasoft.it> 5.4.6-1mamba
- automatic version update by autodist - automatic version update by autodist