mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
set target for darwin binary compat in skarnet.org packages
skalibs: execline: s6-dns: s6-networking: s6-portable-utils: s6-rc: s6: The above software uses the target triplet from `cc -dumpmachine` as a binary compatibility check. However, on darwin, the output includes the darwin version number, which leads to build failures against a binary skalibs package built a different version of darwin than the current system. Explicitly setting target ensures code can be compiled against a skalibs binary built on a different version of darwin. See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
This commit is contained in:
parent
e0c225857f
commit
fc1f5d2cf1
@ -23,7 +23,14 @@ in stdenv.mkDerivation rec {
|
|||||||
"--libdir=\${prefix}/lib"
|
"--libdir=\${prefix}/lib"
|
||||||
"--includedir=\${prefix}/include"
|
"--includedir=\${prefix}/include"
|
||||||
"--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
|
"--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
|
||||||
] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
|
]
|
||||||
|
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||||
|
# On darwin, the target triplet from -dumpmachine includes version number, but
|
||||||
|
# skarnet.org software uses the triplet to test binary compatibility.
|
||||||
|
# Explicitly setting target ensures code can be compiled against a skalibs
|
||||||
|
# binary built on a different version of darwin.
|
||||||
|
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://skarnet.org/software/skalibs/;
|
homepage = http://skarnet.org/software/skalibs/;
|
||||||
|
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-include=${skalibs}/include"
|
"--with-include=${skalibs}/include"
|
||||||
"--with-lib=${skalibs}/lib"
|
"--with-lib=${skalibs}/lib"
|
||||||
"--with-dynlib=${skalibs}/lib"
|
"--with-dynlib=${skalibs}/lib"
|
||||||
] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
|
]
|
||||||
|
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://skarnet.org/software/execline/;
|
homepage = http://skarnet.org/software/execline/;
|
||||||
|
@ -20,7 +20,8 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-include=${skalibs}/include"
|
"--with-include=${skalibs}/include"
|
||||||
"--with-lib=${skalibs}/lib"
|
"--with-lib=${skalibs}/lib"
|
||||||
"--with-dynlib=${skalibs}/lib"
|
"--with-dynlib=${skalibs}/lib"
|
||||||
];
|
]
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.skarnet.org/software/s6-portable-utils/;
|
homepage = http://www.skarnet.org/software/s6-portable-utils/;
|
||||||
|
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-include=${skalibs}/include"
|
"--with-include=${skalibs}/include"
|
||||||
"--with-lib=${skalibs}/lib"
|
"--with-lib=${skalibs}/lib"
|
||||||
"--with-dynlib=${skalibs}/lib"
|
"--with-dynlib=${skalibs}/lib"
|
||||||
] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
|
]
|
||||||
|
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.skarnet.org/software/s6-dns/;
|
homepage = http://www.skarnet.org/software/s6-dns/;
|
||||||
|
@ -32,7 +32,8 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-dynlib=${execline}/lib"
|
"--with-dynlib=${execline}/lib"
|
||||||
"--with-dynlib=${s6}/lib"
|
"--with-dynlib=${s6}/lib"
|
||||||
"--with-dynlib=${s6Dns}/lib"
|
"--with-dynlib=${s6Dns}/lib"
|
||||||
];
|
]
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.skarnet.org/software/s6-networking/;
|
homepage = http://www.skarnet.org/software/s6-networking/;
|
||||||
|
@ -29,7 +29,9 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-dynlib=${skalibs}/lib"
|
"--with-dynlib=${skalibs}/lib"
|
||||||
"--with-dynlib=${execline}/lib"
|
"--with-dynlib=${execline}/lib"
|
||||||
"--with-dynlib=${s6}/lib"
|
"--with-dynlib=${s6}/lib"
|
||||||
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
|
]
|
||||||
|
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://skarnet.org/software/s6-rc/;
|
homepage = http://skarnet.org/software/s6-rc/;
|
||||||
|
@ -26,7 +26,9 @@ in stdenv.mkDerivation rec {
|
|||||||
"--with-lib=${execline}/lib"
|
"--with-lib=${execline}/lib"
|
||||||
"--with-dynlib=${skalibs}/lib"
|
"--with-dynlib=${skalibs}/lib"
|
||||||
"--with-dynlib=${execline}/lib"
|
"--with-dynlib=${execline}/lib"
|
||||||
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
|
]
|
||||||
|
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||||
|
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
substituteInPlace "src/daemontools-extras/s6-log.c" \
|
substituteInPlace "src/daemontools-extras/s6-log.c" \
|
||||||
|
Loading…
Reference in New Issue
Block a user