From 5ccab1868248a152d041307a46f9f1b61257cdc4 Mon Sep 17 00:00:00 2001
From: Etienne Bacher <52219252+etiennebacher@users.noreply.github.com>
Date: Fri, 30 Aug 2024 19:31:28 +0200
Subject: [PATCH] fix: add `-z noexecstack` in Makevars (#1212)

---
 DESCRIPTION         | 2 +-
 NEWS.md             | 5 +++++
 configure           | 6 +++++-
 src/rust/Cargo.toml | 2 +-
 tools/lib-sums.tsv  | 6 ------
 5 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 tools/lib-sums.tsv

diff --git a/DESCRIPTION b/DESCRIPTION
index bc3f68791..82a696c1d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -118,5 +118,5 @@ Collate:
     'zzz.R'
 Config/rextendr/version: 0.3.1
 VignetteBuilder: knitr
-Config/polars/LibVersion: 0.42.0
+Config/polars/LibVersion: 0.42.1
 Config/polars/RustToolchainVersion: nightly-2024-07-26
diff --git a/NEWS.md b/NEWS.md
index 9ee3c98ee..2d32b0b10 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # NEWS
 
+## Polars R Package (development version)
+
+- Add the option `-z noexecstack` for compilation on Linux to avoid the error
+  `version GLIBC_2.39' not found` (#1212).
+
 ## Polars R Package 0.19.0
 
 ### Breaking changes
diff --git a/configure b/configure
index ee349f6d0..fe6ce8772 100755
--- a/configure
+++ b/configure
@@ -10,8 +10,12 @@ LIBNAME="libr_polars.a"
 LIBR_POLARS_DEFAULT_PATH="$(pwd)/tools/${LIBNAME}"
 LIBR_POLARS_PATH=${LIBR_POLARS_PATH:-${LIBR_POLARS_DEFAULT_PATH}}
 
+# -z noexecstack added to avoid following error on Ubuntu:
+# /usr/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.39' not found (required by /usr/local/lib/R/site-library/polars/libs/polars.so)`
+# https://stackoverflow.com/questions/73435637/how-can-i-fix-usr-bin-ld-warning-trap-o-missing-note-gnu-stack-section-imp/73468271#73468271
+#
 # not used on macOS
-ADDITIONAL_PKG_LIBS_FLAG="-lrt"
+ADDITIONAL_PKG_LIBS_FLAG="-lrt -z noexecstack"
 
 export PATH="$PATH:$HOME/.cargo/bin"
 
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index 0fbe793e6..2ee84bacb 100644
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "r-polars"
-version = "0.42.0"
+version = "0.42.1"
 edition = "2021"
 rust-version = "1.80.0"
 publish = false
diff --git a/tools/lib-sums.tsv b/tools/lib-sums.tsv
deleted file mode 100644
index 5c9b328ab..000000000
--- a/tools/lib-sums.tsv
+++ /dev/null
@@ -1,6 +0,0 @@
-url	sha256sum
-https://github.com/pola-rs/r-polars/releases/download/lib-v0.42.0/libr_polars-0.42.0-aarch64-apple-darwin.tar.gz	01d5b4901b8a3c40383791a3be24c1501e43c76cadbd61f11ddad0af574a7569
-https://github.com/pola-rs/r-polars/releases/download/lib-v0.42.0/libr_polars-0.42.0-aarch64-unknown-linux-gnu.tar.gz	bb3728ea09ef36b833c6993bf571c649a21fef05800e72fb0489fc0573c015c3
-https://github.com/pola-rs/r-polars/releases/download/lib-v0.42.0/libr_polars-0.42.0-x86_64-apple-darwin.tar.gz	09c3d1f5a54f2d97c5bdaa36605eb878019dfd8fffd111e0a96de76a5ca57e65
-https://github.com/pola-rs/r-polars/releases/download/lib-v0.42.0/libr_polars-0.42.0-x86_64-pc-windows-gnu.tar.gz	dea0e23194e9fc5eb7e226f0d0b25f74610319d0f96ba1f832315afaae50f5a1
-https://github.com/pola-rs/r-polars/releases/download/lib-v0.42.0/libr_polars-0.42.0-x86_64-unknown-linux-gnu.tar.gz	492555ad0af9f0b30dbef82025d9a3400ff31990cf33c122e6bd88a38097ceab