openbsd: bump sources to 7.9 (#534600)
This commit is contained in:
@@ -20,7 +20,7 @@ makeScopeWithSplicing' {
|
||||
directory = ./pkgs;
|
||||
}
|
||||
// {
|
||||
version = "7.5";
|
||||
version = "7.9";
|
||||
|
||||
stdenvLibcMinimal = stdenvNoLibc.override (old: {
|
||||
cc = old.cc.override {
|
||||
|
||||
@@ -60,6 +60,7 @@ mkDerivation {
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-B${csu}/lib"
|
||||
"-Wno-error"
|
||||
"-fno-builtin"
|
||||
];
|
||||
|
||||
# Suppress lld >= 16 undefined version errors
|
||||
@@ -73,6 +74,11 @@ mkDerivation {
|
||||
"LIBC_TAGS=no"
|
||||
];
|
||||
|
||||
# -fret-clean requires OpenBSD-specific patches to the compiler.
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i 's/-fret-clean//g' {} \;
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
pushd ${include}
|
||||
find include -type d -exec mkdir -p "$dev/{}" ';'
|
||||
|
||||
@@ -17,6 +17,13 @@ mkDerivation {
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
makeFlags = [ "STACK_PROTECTOR=1" ];
|
||||
|
||||
# -fret-clean requires OpenBSD-specific patches to the compiler.
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i 's/-fret-clean//g' {} \;
|
||||
'';
|
||||
|
||||
# DESTDIR is overridden in bsdSetupHook, just fixup afterwards
|
||||
postInstall = ''
|
||||
mv $out/bin $out/libexec
|
||||
|
||||
@@ -7,6 +7,6 @@
|
||||
fetchcvs {
|
||||
cvsRoot = "anoncvs@anoncvs.fr.openbsd.org/cvs";
|
||||
module = "src";
|
||||
tag = "OPENBSD_${lib.replaceStrings [ "." ] [ "_" ] version}-RELEASE";
|
||||
sha256 = "sha256-hzdATew6h/FQV72SWtg3YvUXdPoGjm2SoUS7m3c3fSU=";
|
||||
tag = "OPENBSD_${lib.replaceStrings [ "." ] [ "_" ] version}_BASE";
|
||||
sha256 = "sha256-n6pkgjCvqAGpZzLZnsO8FT7HMtBH3i7SLfhFBqQ9jmE=";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user