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

mariadb: Rename "version" files for LLVM 11

Browse Source 
Libc++abi 11 has `#include <version>` in some places. This clashes with
projects that have files named "version" in directories that end up on
the include path. This includes files named "VERSION" on
case-insensitive file systems.
This commit is contained in:
toonn 2021-07-13 00:23:45 +02:00 committed by Jonathan Ringer
parent b1b5b40c8d
commit 8b09fd98eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/mariadb/default.nix
View File

@ -47,6 +47,10 @@ common = rec { # attributes common to both builds
prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
sed -i 's,/version\>,/version_full,' storage/mroonga/CMakeLists.txt
mv storage/mroonga/version storage/mroonga/version_full
sed -i 's,/VERSION\>,/VERSION_FULL,' cmake/mysql_version.cmake
mv VERSION VERSION_FULL
'';
patches = [

4
pkgs/top-level/all-packages.nix
View File

@ -21190,10 +21190,6 @@ with pkgs;
};
mariadb = callPackage ../servers/sql/mariadb {
# libcxx-11.1.0 includes `<version>` in some places and this picks up
# storage/mroonga/version under clang-11 so we build mariadb with a clang-7
# stdenv instead.
stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};