public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28901 from womfoo/fix/libpt-and-opal

Browse Source 
fix gcc6 builds for libpt and opal
This commit is contained in:
Michael Raskin 2017-09-02 20:25:24 +02:00 committed by GitHub
commit a13734d666
4 changed files with 15 additions and 2906 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/opal/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1"; NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98";
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];

2887
pkgs/development/libraries/ptlib/bison.patch
View File

File diff suppressed because it is too large Load Diff

16
pkgs/development/libraries/ptlib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bison, flex, unixODBC { stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC
, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,12 +9,24 @@ stdenv.mkDerivation rec {
sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs"; sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
}; };
NIX_CFLAGS_COMPILE = "-std=gnu++98";
buildInputs = [ pkgconfig bison flex unixODBC openssl openldap buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./bison.patch ./sslv3.patch ]; patches = [
(fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/bison-fix;
sha256 = "0vzv9kyn9s628z8wy2gva380gi1rmhxilwlg5pikl5a0wn8p46nw";
})
(fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3;
sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0";
})
(fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support;
sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Portable Tools from OPAL VoIP"; description = "Portable Tools from OPAL VoIP";

16
pkgs/development/libraries/ptlib/sslv3.patch
View File

@ -1,16 +0,0 @@
--- ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:54:36.326325637 +0000
+++ ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:55:55.677870908 +0000
@@ -805,11 +805,13 @@
SSL_METHOD * meth;
switch (method) {
+#if !defined(OPENSSL_NO_SSL3)
case SSLv3:
meth = SSLv3_method();
break;
+#endif
case TLSv1:
meth = TLSv1_method();
break;
case SSLv23:
default: