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

Merge pull request #187234 from trofi/drop-libelf-from-gcc

Browse Source 
gcc: drop unused libelf dependency
This commit is contained in:
Sergei Trofimovich
2022-08-19 19:16:35 +01:00
committed by GitHub
parent 8b202db44b 3b60b31d60
commit 7f458e5c50
10 changed files with 19 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/10/default.nix
+2 -6
View File
@@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -29,9 +28,6 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -176,7 +172,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -203,7 +199,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/11/default.nix
+2 -6
View File
@@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -29,9 +28,6 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -184,7 +180,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -211,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/12/default.nix
+2 -6
View File
@@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -29,9 +28,6 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -179,7 +175,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -206,7 +202,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/4.8/default.nix
+2 -6
View File
@@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -183,7 +179,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
@@ -211,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog
enableLTO
pkgs/development/compilers/gcc/4.9/default.nix
+2 -6
View File
@@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -203,7 +199,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
@@ -231,7 +227,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog
enableLTO
pkgs/development/compilers/gcc/6/default.nix
+2 -6
View File
@@ -15,7 +15,6 @@
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, gnatboot ? null
@@ -40,9 +39,6 @@ assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home'
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -213,7 +209,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -242,7 +238,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/7/default.nix
+2 -6
View File
@@ -12,7 +12,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@@ -26,9 +25,6 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -182,7 +178,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -210,7 +206,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/8/default.nix
+2 -6
View File
@@ -12,7 +12,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@@ -26,9 +25,6 @@
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -166,7 +162,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -193,7 +189,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/9/default.nix
+2 -6
View File
@@ -14,7 +14,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -34,9 +33,6 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.buildPlatform.isDarwin -> gnused != null;
@@ -178,7 +174,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
gmp mpfr libmpc
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
@@ -205,7 +201,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/common/configure-flags.nix
+1 -2
View File
@@ -4,7 +4,7 @@
, crossStageStatic, libcCross
, version
, gmp, mpfr, libmpc, libelf, isl
, gmp, mpfr, libmpc, isl
, cloog ? null
, enableLTO
@@ -110,7 +110,6 @@ let
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
]
++ lib.optional (libelf != null) "--with-libelf=${libelf}"
++ lib.optionals (!crossStageStatic) [
(if libcCross == null
then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"