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

Merge pull request #212275 from alyssais/libdl

Browse Source 
treewide: remove -ldl linker flags
This commit is contained in:
John Ericson 2023-01-23 16:28:21 -05:00 committed by GitHub
commit 8240bc77e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/jack-rack/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ];
NIX_LDFLAGS = "-ldl -lm -lpthread";
NIX_LDFLAGS = "-lm -lpthread";
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

2
pkgs/applications/audio/jamin/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
# `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-ldl";
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
'';

6
pkgs/build-support/libredirect/default.nix
View File

@ -46,14 +46,14 @@ else stdenv.mkDerivation rec {
-L${llvmPackages_13.clang.libc}/lib \
-Wl,-install_name,$libName \
-Wall -std=c99 -O3 -fPIC libredirect.c \
-ldl -shared -o "$libName"
-shared -o "$libName"
'' else if stdenv.isDarwin then ''
$CC -Wall -std=c99 -O3 -fPIC libredirect.c \
-Wl,-install_name,$out/lib/$libName \
-ldl -shared -o "$libName"
-shared -o "$libName"
'' else ''
$CC -Wall -std=c99 -O3 -fPIC libredirect.c \
-ldl -shared -o "$libName"
-shared -o "$libName"
''}
if [ -n "$doInstallCheck" ]; then

2
pkgs/desktops/rox/rox-filer/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
buildInputs = [ libxml2 gtk shared-mime-info libSM ];
NIX_LDFLAGS = "-ldl -lm";
NIX_LDFLAGS = "-lm";
patches = [
./rox-filer-2.11-in-source-build.patch

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

@ -187,7 +187,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = (import ../common/pre-configure.nix {
inherit lib;

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

@ -191,7 +191,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = (import ../common/pre-configure.nix {
inherit lib;

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

@ -228,7 +228,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = (import ../common/pre-configure.nix {

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

@ -226,7 +226,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = import ../common/pre-configure.nix {
inherit lib;

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

@ -194,7 +194,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = import ../common/pre-configure.nix {
inherit lib;

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

@ -175,7 +175,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = import ../common/pre-configure.nix {
inherit lib;

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

@ -187,7 +187,7 @@ stdenv.mkDerivation ({
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
preConfigure = import ../common/pre-configure.nix {
inherit lib;

1
pkgs/development/compilers/tinycc/default.nix
View File

@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
"-L${variables.libdir}"
"-Wl,--rpath ${variables.libdir}"
"-ltcc"
"-ldl"
];
variables = rec {
prefix = "${placeholder "out"}";

1
pkgs/games/eboard/default.nix
View File

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
'';
NIX_CFLAGS_COMPILE = "-fpermissive";
NIX_LDFLAGS = "-ldl";
meta = {
homepage = "http://www.bergo.eng.br/eboard/";

4
pkgs/servers/mail/exim/default.nix
View File

@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
${lib.optionalString enableMySQL ''
s:^# \(LOOKUP_MYSQL=yes\)$:\1:
s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz:
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/:
''}
${lib.optionalString enableAuthDovecot ''

1
pkgs/servers/monitoring/nagios/default.nix
View File

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
configureFlags = [ "--localstatedir=/var/lib/nagios" ];
buildFlags = [ "all" ];
CFLAGS = "-ldl";
# Do not create /var directories
preInstall = ''

2
pkgs/servers/nosql/influxdb/default.nix
View File

@ -33,7 +33,7 @@ let
Version: ${libflux_version}
Description: Library for the InfluxData Flux engine
Cflags: -I/out/include
Libs: -L/out/lib -lflux -ldl -lpthread
Libs: -L/out/lib -lflux -lpthread
'';
passAsFile = [ "pkgcfg" ];
postInstall = ''

2
pkgs/servers/nosql/influxdb2/default.nix
View File

@ -51,7 +51,7 @@ let
Version: ${libflux_version}
Description: Library for the InfluxData Flux engine
Cflags: -I/out/include
Libs: -L/out/lib -lflux -ldl -lpthread
Libs: -L/out/lib -lflux -lpthread
'';
passAsFile = [ "pkgcfg" ];
postInstall = ''

1
pkgs/servers/openafs/1.8/default.nix
View File

@ -89,7 +89,6 @@ stdenv.mkDerivation {
)
'' + optionalString withTsm ''
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
export XBSA_XLIBS="-ldl"
'';
buildFlags = [ "all_nolibafs" ];

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

@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
LINKFLAGS +=
${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)}
-ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss
-lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss
-ljpeg -ltiff -lpng -lssl ;
'';
in ''

2
pkgs/tools/networking/dsniff/default.nix
View File

@ -60,7 +60,7 @@ in gcc9Stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook rpcsvc-proto ];
buildInputs = [ glib pcap libtirpc libnsl ];
NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl -ltirpc";
NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc";
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
postPatch = ''
for patch in debian/patches/*.patch; do