gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126912 from Mindavi/libvpx/cross-compilation

Browse Source
This commit is contained in:
Sandro
2021-06-17 12:35:25 +02:00
committed by GitHub
parent f43515f761 7907718faf
commit 3a70a0a6f1
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libvpx/1_8.nix
+8 -6
View File
@@ -69,7 +69,14 @@ stdenv.mkDerivation rec {
# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
];
postPatch = "patchShebangs .";
postPatch = ''
patchShebangs --build \
build/make/*.sh \
build/make/*.pl \
build/make/*.pm \
test/*.sh \
configure
'';
outputs = [ "bin" "dev" "out" ];
setOutputFlags = false;
@@ -135,11 +142,6 @@ stdenv.mkDerivation rec {
experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental")
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"--extra-cflags="
#"--extra-cxxflags="
#"--prefix="
#"--libc="
#"--libdir="
"--enable-external-build"
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
# See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
pkgs/development/libraries/libvpx/default.nix
+15 -7
View File
@@ -65,7 +65,21 @@ stdenv.mkDerivation rec {
sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w=";
};
postPatch = "patchShebangs .";
postPatch = ''
patchShebangs --build \
build/make/*.sh \
build/make/*.pl \
build/make/*.pm \
test/*.sh \
configure
# When cross-compiling (for aarch64-multiplatform), the compiler errors out on these flags.
# Since they're 'just' warnings, it's fine to just remove them.
substituteInPlace configure \
--replace "check_add_cflags -Wparentheses-equality" "" \
--replace "check_add_cflags -Wunreachable-code-loop-increment" "" \
--replace "check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32" ""
'';
outputs = [ "bin" "dev" "out" ];
setOutputFlags = false;
@@ -131,12 +145,6 @@ stdenv.mkDerivation rec {
experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental")
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"--extra-cflags="
#"--extra-cxxflags="
#"--prefix="
#"--libc="
#"--libdir="
"--enable-external-build"
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
# See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
# Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14