nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

binutils: consolidate plugin-api.h support in a single

Browse Source 
I got the plugin API support at least once incorrect. Instead of
copying the deifnition let's consolidate it within binutils itself.

While at it forward-ported changes to llvm_{13,14,15}.
The change is a no-op from rebuild perspective.
This commit is contained in:
Sergei Trofimovich 2023-01-30 19:21:05 +00:00
parent 106af1cb72
commit b9a9dfc3d4
14 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/10/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

2
pkgs/development/compilers/llvm/11/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

2
pkgs/development/compilers/llvm/12/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

3
pkgs/development/compilers/llvm/13/llvm/default.nix
View File

@ -5,6 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2
@ -153,7 +154,7 @@ in stdenv.mkDerivation (rec {
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ optionals (!isDarwin) [
] ++ optionals (enableGoldPlugin) [
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
] ++ optionals isDarwin [
"-DLLVM_ENABLE_LIBCXX=ON"

3
pkgs/development/compilers/llvm/14/llvm/default.nix
View File

@ -6,6 +6,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2
@ -165,7 +166,7 @@ in stdenv.mkDerivation (rec {
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ optionals (!isDarwin) [
] ++ optionals (enableGoldPlugin) [
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
] ++ optionals isDarwin [
"-DLLVM_ENABLE_LIBCXX=ON"

3
pkgs/development/compilers/llvm/15/llvm/default.nix
View File

@ -9,6 +9,7 @@
, python3
, python3Packages
, libffi
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2
@ -327,7 +328,7 @@ in stdenv.mkDerivation (rec {
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ optionals (!isDarwin) [
] ++ optionals (enableGoldPlugin) [
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
] ++ optionals isDarwin [
"-DLLVM_ENABLE_LIBCXX=ON"

2
pkgs/development/compilers/llvm/5/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libxml2
, ncurses

2
pkgs/development/compilers/llvm/6/llvm/default.nix
View File

@ -4,7 +4,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libxml2
, ncurses

2
pkgs/development/compilers/llvm/7/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

2
pkgs/development/compilers/llvm/8/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

2
pkgs/development/compilers/llvm/9/llvm/default.nix
View File

@ -5,7 +5,7 @@
, cmake
, python3
, libffi
, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
, enableGoldPlugin ? libbfd.hasPluginAPI
, libbfd
, libpfm
, libxml2

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -232,6 +232,8 @@ stdenv.mkDerivation (finalAttrs: {
inherit targetPrefix;
hasGold = enableGold;
isGNU = true;
# Having --enable-plugins is not enough, system has to support dlopen()
hasPluginAPI = enableGold && !stdenv.isDarwin && !stdenv.targetPlatform.isWasi;
};
meta = with lib; {

2
pkgs/development/tools/misc/binutils/libbfd.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
];
passthru = {
dev = binutils-unwrapped-all-targets.dev;
inherit (binutils-unwrapped-all-targets) dev hasPluginAPI;
};
meta = with lib; {

2
pkgs/development/tools/misc/binutils/libopcodes.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
];
passthru = {
dev = binutils-unwrapped-all-targets.dev;
inherit (binutils-unwrapped-all-targets) dev hasPluginAPI;
};
meta = with lib; {