folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from microsoft/mamalisz/fix-lua 

Fix lua build errors adding fPIC
This commit is contained in:
jslobodzian 2020-08-11 23:28:29 -07:00 committed by GitHub
parent 59e916c696 71ac93430a
commit 4a1136c03c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPECS/lua/lua.spec
View File

@ -4,7 +4,7 @@
Summary: Programming language Summary: Programming language
Name: lua Name: lua
Version: 5.3.5 Version: 5.3.5
Release: 5%{?dist} Release: 6%{?dist}
License: MIT License: MIT
URL: https://www.lua.org URL: https://www.lua.org
Group: Development/Tools Group: Development/Tools
@ -31,7 +31,7 @@ Static libraries and header files for the support library for lua
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h
sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS+= -DLUA_COMPAT_MODULE /' src/Makefile sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS+= -fPIC -O2 -DLUA_COMPAT_MODULE /' src/Makefile
cp %{SOURCE1} ./ cp %{SOURCE1} ./
%build %build
@ -91,6 +91,8 @@ rm -rf %{buildroot}
%{_libdir}/liblua.so %{_libdir}/liblua.so
%changelog %changelog
* Tue Aug 11 2020 Mateusz Malisz <mamalisz@microsoft.com> 5.3.5-6
- Append -fPIC and -O2 to CFLAGS to fix build issues.
* Fri Jul 31 2020 Leandro Pereira <leperei@microsoft.com> 5.3.5-5 * Fri Jul 31 2020 Leandro Pereira <leperei@microsoft.com> 5.3.5-5
- Don't stomp on CFLAGS. - Don't stomp on CFLAGS.
* Thu Jun 06 2020 Joe Schmitt <joschmit@microsoft.com> 5.3.5-4 * Thu Jun 06 2020 Joe Schmitt <joschmit@microsoft.com> 5.3.5-4

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -143,7 +143,7 @@ libltdl-2.4.6-5.cm1.aarch64.rpm
libltdl-devel-2.4.6-5.cm1.aarch64.rpm libltdl-devel-2.4.6-5.cm1.aarch64.rpm
pcre-libs-8.42-4.cm1.aarch64.rpm pcre-libs-8.42-4.cm1.aarch64.rpm
krb5-1.17-3.cm1.aarch64.rpm krb5-1.17-3.cm1.aarch64.rpm
lua-5.3.5-5.cm1.aarch64.rpm lua-5.3.5-6.cm1.aarch64.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-repos-1.0-8.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -143,7 +143,7 @@ libltdl-2.4.6-5.cm1.x86_64.rpm
libltdl-devel-2.4.6-5.cm1.x86_64.rpm libltdl-devel-2.4.6-5.cm1.x86_64.rpm
pcre-libs-8.42-4.cm1.x86_64.rpm pcre-libs-8.42-4.cm1.x86_64.rpm
krb5-1.17-3.cm1.x86_64.rpm krb5-1.17-3.cm1.x86_64.rpm
lua-5.3.5-5.cm1.x86_64.rpm lua-5.3.5-6.cm1.x86_64.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-repos-1.0-8.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm

6
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -223,9 +223,9 @@ libxml2-python-2.9.10-1.cm1.aarch64.rpm
libxslt-1.1.34-1.cm1.aarch64.rpm libxslt-1.1.34-1.cm1.aarch64.rpm
libxslt-debuginfo-1.1.34-1.cm1.aarch64.rpm libxslt-debuginfo-1.1.34-1.cm1.aarch64.rpm
libxslt-devel-1.1.34-1.cm1.aarch64.rpm libxslt-devel-1.1.34-1.cm1.aarch64.rpm
lua-5.3.5-5.cm1.aarch64.rpm lua-5.3.5-6.cm1.aarch64.rpm
lua-debuginfo-5.3.5-5.cm1.aarch64.rpm lua-debuginfo-5.3.5-6.cm1.aarch64.rpm
lua-devel-5.3.5-5.cm1.aarch64.rpm lua-devel-5.3.5-6.cm1.aarch64.rpm
lvm2-2.03.05-5.cm1.aarch64.rpm lvm2-2.03.05-5.cm1.aarch64.rpm
lvm2-debuginfo-2.03.05-5.cm1.aarch64.rpm lvm2-debuginfo-2.03.05-5.cm1.aarch64.rpm
lvm2-devel-2.03.05-5.cm1.aarch64.rpm lvm2-devel-2.03.05-5.cm1.aarch64.rpm

6
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -223,9 +223,9 @@ libxml2-python-2.9.10-1.cm1.x86_64.rpm
libxslt-1.1.34-1.cm1.x86_64.rpm libxslt-1.1.34-1.cm1.x86_64.rpm
libxslt-debuginfo-1.1.34-1.cm1.x86_64.rpm libxslt-debuginfo-1.1.34-1.cm1.x86_64.rpm
libxslt-devel-1.1.34-1.cm1.x86_64.rpm libxslt-devel-1.1.34-1.cm1.x86_64.rpm
lua-5.3.5-5.cm1.x86_64.rpm lua-5.3.5-6.cm1.x86_64.rpm
lua-debuginfo-5.3.5-5.cm1.x86_64.rpm lua-debuginfo-5.3.5-6.cm1.x86_64.rpm
lua-devel-5.3.5-5.cm1.x86_64.rpm lua-devel-5.3.5-6.cm1.x86_64.rpm
lvm2-2.03.05-5.cm1.x86_64.rpm lvm2-2.03.05-5.cm1.x86_64.rpm
lvm2-debuginfo-2.03.05-5.cm1.x86_64.rpm lvm2-debuginfo-2.03.05-5.cm1.x86_64.rpm
lvm2-devel-2.03.05-5.cm1.x86_64.rpm lvm2-devel-2.03.05-5.cm1.x86_64.rpm