[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e22cda58e51721fd2d0248f05528d68734f1d6d1

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1886 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  e22cda58e51721fd2d0248f05528d68734f1d6d1 (commit)
      from  6e8f918394bee991c7d388ca1c5fd2ce16f5743d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e22cda58e51721fd2d0248f05528d68734f1d6d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Mar 9 11:15:15 2023 +0000

    luajit: Ensure this package is being built with SSP
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 luajit/luajit.nm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/luajit/luajit.nm b/luajit/luajit.nm
index ac94acd63..c963efe70 100644
--- a/luajit/luajit.nm
+++ b/luajit/luajit.nm
@@ -5,7 +5,7 @@
 
 name       = luajit
 version    = 2.1.0
-release    = 0.1-beta3-%{commit}
+release    = 0.2-beta3-%{commit}
 thisapp    = luajit-2.0-%{commit}
 
 # LuaJIT no longer tags releases:
@@ -27,8 +27,14 @@ source_dl  = https://repo.or.cz/luajit-2.0.git/snapshot/
 sources    = %{commit}.tar.gz
 
 build
+	prepare_cmds
+		# Do not disable stack protection
+		sed -e "s/-fno-stack-protector//" -i src/Makefile
+	end
+
 	build
-		make amalg PREFIX="%{prefix}" BUILDMODE=dynamic TARGET_STRIP=" @:"
+		make amalg PREFIX="%{prefix}" BUILDMODE=dynamic Q= TARGET_STRIP=" @:" \
+			CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS}
 	end
 
 	install


hooks/post-receive
--
IPFire 3.x development tree