ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

libffi: 3.0.13 -> 3.2.1

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-26 16:12:24 -07:00
parent a0aec63eb8
commit 47fe162bb9
2 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libffi/default.nix
View File

@ -1,23 +1,21 @@
{ fetchurl, stdenv, dejagnu }: { fetchurl, stdenv, dejagnu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libffi-3.0.13"; name = "libffi-3.2.1";
src = fetchurl { src = fetchurl {
url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz"; url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x"; sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
}; };
patches = stdenv.lib.optional (stdenv.needsPax) ./libffi-3.0.13-emutramp_pax_proc.patch;
buildInputs = stdenv.lib.optional doCheck dejagnu; buildInputs = stdenv.lib.optional doCheck dejagnu;
configureFlags = [ configureFlags = [
"--with-gcc-arch=generic" # no detection of -march= or -mtune= "--with-gcc-arch=generic" # no detection of -march= or -mtune=
] ++ stdenv.lib.optional (stdenv.needsPax) "--enable-pax_emutramp"; "--enable-pax_emutramp"
];
#doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
doCheck = false;
dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.

37
pkgs/development/libraries/libffi/libffi-3.0.13-emutramp_pax_proc.patch
View File

@ -1,37 +0,0 @@
2013-05-22 Magnus Granberg <zorry@gentoo.org>
#457194
* src/closuer.c (emutramp_enabled_check): Check with /proc.
--- a/src/closures.c 2013-03-17 23:27:11.000000000 +0100
+++ b/src/closures.c 2013-04-29 23:26:02.279022022 +0200
@@ -181,10 +181,26 @@ static int emutramp_enabled = -1;
static int
emutramp_enabled_check (void)
{
- if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL)
- return 1;
- else
+ char *buf = NULL;
+ size_t len = 0;
+ FILE *f;
+ int ret;
+ f = fopen ("/proc/self/status", "r");
+ if (f == NULL)
return 0;
+ ret = 0;
+
+ while (getline (&buf, &len, f) != -1)
+ if (!strncmp (buf, "PaX:", 4))
+ {
+ char emutramp;
+ if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
+ ret = (emutramp == 'E');
+ break;
+ }
+ free (buf);
+ fclose (f);
+ return ret;
}
#define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \