Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes for modules after recent bumps #13

Merged
merged 3 commits into from
Oct 25, 2024
Merged

Various fixes for modules after recent bumps #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ef5f79
lua: don't provide DESTDIR when compiling luajit2.
thresheek Oct 25, 2024
04236aa
lua: skip on SLES12 due to too old openssl.
thresheek Oct 25, 2024
4e052f3
thrift: fixed build on Amazon Linux 2
thresheek Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion alpine/Makefile.module-lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ MODULE_DEPENDS_lua=$(NDK_DEPENDENCY_TAG)

define MODULE_PREBUILD_lua
cd ../luajit2-$(LUAJIT2_VERSION) \&\& \
DESTDIR=`pwd` CFLAGS="-fPIC" make $$_make_opts install
CFLAGS="-fPIC" make $$_make_opts \&\& \
DESTDIR=`pwd` make $$_make_opts install
endef
export MODULE_PREBUILD_lua

Expand Down
23 changes: 5 additions & 18 deletions contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
From 7fd0aace135c794e2a791913a4e09412208e88c3 Mon Sep 17 00:00:00 2001
From 25c75dcc1d911c3b97231e22fffa94da7bccb2bd Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 22 Nov 2023 13:46:29 -0800
Subject: [PATCH 2/2] Fixed build with GCC 4.8.5 on RHEL 7.
Subject: [PATCH] Fixed build with GCC 4.8.5 on RHEL 7.

---
lib/cpp/src/thrift/numeric_cast.h | 1 +
lib/cpp/src/thrift/transport/TBufferTransports.h | 1 +
2 files changed, 2 insertions(+)
1 file changed, 1 insertion(+)

diff --git a/lib/cpp/src/thrift/numeric_cast.h b/lib/cpp/src/thrift/numeric_cast.h
index d7063dbc6..8775121a0 100644
--- a/lib/cpp/src/thrift/numeric_cast.h
+++ b/lib/cpp/src/thrift/numeric_cast.h
@@ -22,6 +22,7 @@

#include <limits>
#include <stdexcept>
+#include <typeinfo>

#if defined(_MSC_VER)
// avoid compiler warnings and errors in MSVC if max is defined as a macro
diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h
index f72d8f6bf..f8d23bf11 100644
index 8518800a4..e74143243 100644
--- a/lib/cpp/src/thrift/transport/TBufferTransports.h
+++ b/lib/cpp/src/thrift/transport/TBufferTransports.h
@@ -23,6 +23,7 @@
Expand All @@ -33,5 +20,5 @@ index f72d8f6bf..f8d23bf11 100644
#include <thrift/transport/TTransport.h>
#include <thrift/transport/TVirtualTransport.h>
--
2.39.3 (Apple Git-145)
2.46.1

3 changes: 2 additions & 1 deletion debian/Makefile.module-lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export MODULE_DEFINITIONS_lua

define MODULE_PREBUILD_lua
cd $$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION) \&\& \
DESTDIR="$$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)" CFLAGS="-fPIC" $$(MAKE) -j$$(NUMJOBS) install
$$(MAKE) -j$$(NUMJOBS) \&\& \
DESTDIR="$$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)" $$(MAKE) install
mv $$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)/usr/bin/luajit $$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)/usr/bin/nginx-luajit
mv $$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)/usr/share/man/man1/luajit.1 $$(BUILDDIR_nginx)/extra/luajit2-$(LUAJIT2_VERSION)/usr/share/man/man1/nginx-luajit.1
endef
Expand Down
5 changes: 5 additions & 0 deletions rpm/SPECS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,11 @@ check-compat-%:
nginx-module-$${module}.skip ; \
exit ; \
fi ; \
if [ `rpm --eval '0%{?suse_version}'` -gt 0 -a `rpm --eval '0%{?suse_version}'` -lt 1500 ]; then \
echo "Lua can't be build on SLES < 15 due to too old openssl" > \
nginx-module-$${module}.skip ; \
exit ; \
fi ; \
;; \
otel) \
if [ "`rpm --eval '0%{?suse_version}'`" -gt 0 ]; then \
Expand Down
3 changes: 2 additions & 1 deletion rpm/SPECS/Makefile.module-lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export MODULE_DEFINITIONS_lua

define MODULE_PREBUILD_lua
cd %{bdir}/luajit2-$(LUAJIT2_VERSION)
DESTDIR="%{bdir}/luajit2-$(LUAJIT2_VERSION)" CFLAGS="-fPIC" make %{?_smp_mflags} install
CFLAGS="-fPIC" make %{?_smp_mflags}
DESTDIR="%{bdir}/luajit2-$(LUAJIT2_VERSION)" make install
mv %{bdir}/luajit2-$(LUAJIT2_VERSION)/usr/bin/luajit %{bdir}/luajit2-$(LUAJIT2_VERSION)/usr/bin/nginx-luajit
endef
export MODULE_PREBUILD_lua
Expand Down