Merge pull request #94879 from elohmeier/otfcc-aarch64

otfcc: fix aarch64 compatibility
This commit is contained in:
Thomas Tuegel 2020-08-08 20:29:47 -05:00 committed by GitHub
commit d005e987a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 8 deletions

View file

@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ premake5 ];
# Dont guess where our makefiles will end up. Just use current
# directory.
patchPhase = ''
substituteInPlace premake5.lua \
--replace 'location "build/gmake"' 'location "."'
'';
patches = [
./fix-aarch64.patch
./move-makefiles.patch
];
buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ];
installPhase = ''
mkdir -p $out/bin
cp bin/release-x*/otfcc* $out/bin/
cp bin/release-*/otfcc* $out/bin/
'';
enableParallelBuilding = true;
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "Optimized OpenType builder and inspector";
homepage = "https://github.com/caryll/otfcc";
license = licenses.asl20;
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ jfrankenau ttuegel ];
};

View file

@ -0,0 +1,22 @@
diff --git a/premake5.lua b/premake5.lua
index 997fd79..54a20a0 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -49,7 +49,7 @@ end
workspace "otfcc"
configurations { "release", "debug" }
- platforms { "x64", "x86" }
+ platforms { "x64", "x86", "arm" }
filter "action:xcode4"
platforms { "x64" }
filter {}
@@ -67,6 +67,8 @@ workspace "otfcc"
architecture "x86"
filter "platforms:x64"
architecture "x64"
+ filter "platforms:arm"
+ architecture "arm"
filter {}
filter "action:vs2017"

View file

@ -0,0 +1,13 @@
diff --git a/premake5.lua b/premake5.lua
index 997fd79..54a20a0 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -88,7 +90,7 @@ workspace "otfcc"
flags { "StaticRuntime" }
includedirs { "dep/polyfill-msvc" }
filter "action:gmake"
- location "build/gmake"
+ location "."
filter "action:xcode4"
location "build/xcode"
filter {}