mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
julia: fix build and execution on PaX.
Alpine and Gentoo set the same flags here, FWIW.
This commit is contained in:
parent
dd934beb9f
commit
19f70f03b2
@ -2,6 +2,7 @@
|
|||||||
# build tools
|
# build tools
|
||||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||||
, runCommand
|
, runCommand
|
||||||
|
, paxctl
|
||||||
# libjulia dependencies
|
# libjulia dependencies
|
||||||
, libunwind, readline, utf8proc, zlib
|
, libunwind, readline, utf8proc, zlib
|
||||||
, llvm, libffi, ncurses
|
, llvm, libffi, ncurses
|
||||||
@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
./0001.1-use-system-utf8proc.patch
|
./0001.1-use-system-utf8proc.patch
|
||||||
./0002-use-system-suitesparse.patch
|
./0002-use-system-suitesparse.patch
|
||||||
];
|
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs . contrib
|
patchShebangs . contrib
|
||||||
@ -89,7 +90,8 @@ stdenv.mkDerivation rec {
|
|||||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||||
;
|
;
|
||||||
|
|
||||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
|
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||||
|
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
let
|
let
|
||||||
|
25
pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
Normal file
25
pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Will Dietz <w@wdtz.org>
|
||||||
|
Date: Wed, 1 Feb 2017 06:09:49 -0600
|
||||||
|
Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 8d45a1baa..91ea33b21 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps
|
||||||
|
|
||||||
|
julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
|
||||||
|
@$(MAKE) $(QUIET_MAKE) -C ui julia-$*
|
||||||
|
+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
|
||||||
|
+ @paxctl -czexm $(JULIA_EXECUTABLE_$*)
|
||||||
|
|
||||||
|
julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
|
||||||
|
@$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
25
pkgs/development/compilers/julia/0004-hardened.patch
Normal file
25
pkgs/development/compilers/julia/0004-hardened.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From eddb251a00ace6e63e32e7dcb9e1ec632cac14e0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Will Dietz <w@wdtz.org>
|
||||||
|
Date: Wed, 1 Feb 2017 06:09:49 -0600
|
||||||
|
Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 0e28cc87b..aab8cfa8d 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -91,6 +91,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps julia_flisp.boot.in
|
||||||
|
|
||||||
|
julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
|
||||||
|
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
|
||||||
|
+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
|
||||||
|
+ @paxctl -czexm $(JULIA_EXECUTABLE_$*)
|
||||||
|
|
||||||
|
julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
|
||||||
|
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchgit, fetchurl
|
{ stdenv, fetchgit, fetchurl
|
||||||
# build tools
|
# build tools
|
||||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
|
||||||
# libjulia dependencies
|
# libjulia dependencies
|
||||||
, libunwind, llvm, readline, utf8proc, zlib
|
, libunwind, llvm, readline, utf8proc, zlib
|
||||||
# standard library dependencies
|
# standard library dependencies
|
||||||
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||||||
./0001-use-system-utf8proc.patch
|
./0001-use-system-utf8proc.patch
|
||||||
./0002-use-system-suitesparse.patch
|
./0002-use-system-suitesparse.patch
|
||||||
./0003-no-ldconfig.patch
|
./0003-no-ldconfig.patch
|
||||||
];
|
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs . contrib
|
patchShebangs . contrib
|
||||||
@ -79,7 +79,8 @@ stdenv.mkDerivation rec {
|
|||||||
] ++
|
] ++
|
||||||
stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
|
stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
|
||||||
|
|
||||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
|
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||||
|
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
let
|
let
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchgit, fetchurl
|
{ stdenv, fetchgit, fetchurl
|
||||||
# build tools
|
# build tools
|
||||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
|
||||||
# libjulia dependencies
|
# libjulia dependencies
|
||||||
, libunwind, readline, utf8proc, zlib
|
, libunwind, readline, utf8proc, zlib
|
||||||
, llvm
|
, llvm
|
||||||
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
./0001.1-use-system-utf8proc.patch
|
./0001.1-use-system-utf8proc.patch
|
||||||
./0002-use-system-suitesparse.patch
|
./0002-use-system-suitesparse.patch
|
||||||
];
|
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs . contrib
|
patchShebangs . contrib
|
||||||
@ -86,7 +86,8 @@ stdenv.mkDerivation rec {
|
|||||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||||
;
|
;
|
||||||
|
|
||||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
|
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||||
|
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
let
|
let
|
||||||
|
Loading…
Reference in New Issue
Block a user