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

remove local pic flags, now set by hardened stdenv

Browse Source
This commit is contained in:
Robin Gloster 2016-01-28 01:46:59 +00:00
parent 8329066d5e
commit acb408646e
15 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
};
NIX_CFLAGS_COMPILE = "-fpic";
# From Handbrake
patches = [
./A00-a52-state-t-public.patch

1
pkgs/development/libraries/cgui/default.nix
View File

@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
buildInputs = [ texinfo allegro perl ];
configurePhase = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
sh fix.sh unix
'';

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

@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
NIX_CFLAGS_COMPILE = optional (!staticSupport) "-fPIC";
parallelBuild = false;
meta = with stdenv.lib; {

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

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
patchPhase = ''patchShebangs .'';
buildInputs = [ perl zlib ];
makeFlags = "CFLAGS=-fPIC";
meta = {
description = "Hebrew spell checker";
homepage = http://hspell.ivrix.org.il/;

1
pkgs/development/libraries/itk/default.nix
View File

@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
"-DBUILD_TESTING=OFF"
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_CXX_FLAGS=-fPIC"
];
enableParallelBuilding = true;

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

@ -12,8 +12,6 @@ stdenv.mkDerivation {
buildInputs = [ automake autoconf libtool ];
CFLAGS="-fPIC";
# .so endings are missing (quick and dirty fix)
postInstall = ''
for i in $out/lib/*; do

1
pkgs/development/libraries/libunwind/default.nix
View File

@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ xz ];
NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
preInstall = ''
mkdir -p "$out/lib"
touch "$out/lib/libunwind-generic.so"

4
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, boost, makePIC ? false }:
{ stdenv, fetchurl, cmake, boost }:
stdenv.mkDerivation {
name = "libyaml-cpp-0.5.1";
@ -10,8 +10,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake boost ];
cmakeFlags = stdenv.lib.optionals makePIC [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ];
meta = with stdenv.lib; {
homepage = http://code.google.com/p/yaml-cpp/;
description = "A YAML parser and emitter for C++";

2
pkgs/development/libraries/phonon/qt5/default.nix
View File

@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
NIX_CFLAGS_COMPILE = "-fPIC";
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
"-DPHONON_BUILD_PHONON4QT5=ON"

5
pkgs/development/libraries/plib/default.nix
View File

@ -1,6 +1,5 @@
{ fetchurl, stdenv, mesa, freeglut, SDL
, libXi, libSM, libXmu, libXext, libX11,
enablePIC ? false }:
, libXi, libSM, libXmu, libXext, libX11 }:
stdenv.mkDerivation rec {
name = "plib-1.8.5";
@ -13,8 +12,6 @@ stdenv.mkDerivation rec {
patches = [ ./CVE-2012-4552.patch ];
NIX_CFLAGS_COMPILE = if enablePIC then "-fPIC" else "";
propagatedBuildInputs = [
mesa freeglut SDL

4
pkgs/development/libraries/science/math/atlas/default.nix
View File

@ -73,14 +73,10 @@ stdenv.mkDerivation {
configureScript=../configure
'';
# * -fPIC is passed even in non-shared builds so that the ATLAS code can be
# used to inside of shared libraries, like Octave does.
#
# * -t 0 disables use of multi-threading. It's not quite clear what the
# consequences of that setting are and whether it's necessary or not.
configureFlags = [
"-Fa alg"
"-fPIC"
"-t ${threads}"
cpuConfig
] ++ optional shared "--shared"

2
pkgs/development/libraries/science/math/suitesparse/default.nix
View File

@ -33,8 +33,6 @@ stdenv.mkDerivation {
"LAPACK="
];
NIX_CFLAGS = "-fPIC";
postInstall = ''
# Build and install shared library
(

3
pkgs/development/libraries/zlib/default.nix
View File

@ -31,8 +31,7 @@ stdenv.mkDerivation (rec {
# As zlib takes part in the stdenv building, we don't want references
# to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc "
+ stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";
crossAttrs = {
dontStrip = static;

2
pkgs/development/tools/toluapp/default.nix
View File

@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
--replace /usr/local $out
'';
NIX_CFLAGS_COMPILE = "-fPIC";
buildPhase = ''scons'';
installPhase = ''scons install'';

2
pkgs/tools/graphics/netpbm/default.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
--replace '"-DSAFER"' '"-DPARANOIDSAFER"'
'';
NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform
buildInputs =
[ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libtiff ]
++ lib.optional enableX11 libX11;