Skip to content

Commit

Permalink
fix: add -z noexecstack in Makevars (#1212)
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennebacher authored Aug 30, 2024
1 parent cf0f9e0 commit 5ccab18
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 0 additions & 6 deletions tools/lib-sums.tsv

This file was deleted.

0 comments on commit 5ccab18

Please sign in to comment.