[PLATFORM] Support multiple platforms with different LIBDIR etc.

docker/skiabuild/docker-compose.yml

@@ -85,3 +85,28 @@ services:
     entrypoint: /entrypoint.sh
     working_dir: /work
 
+  skiatest_alpine:
+    build:
+      context: .
+      dockerfile: skiatest-alpine.Dockerfile
+    image: jameswalmsley/skiatest:alpine
+    volumes:
+      - /home/${CURRENT_USER}:/home/${CURRENT_USER}
+      - ./entrypoint.sh:/entrypoint.sh
+      - ./userentry.sh:/userentry.sh
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      - /dev:/dev
+      - /tmp:/tmp
+    environment:
+      - DISPLAY
+      - CURRENT_UID
+      - CURRENT_GID
+      - CURRENT_USER
+      - CURRENT_DIR
+      - TERM=xterm-256color
+    hostname: skiatest
+    stdin_open: true
+    tty: true
+    privileged: true
+    entrypoint: /entrypoint.sh
+    working_dir: /work

recipes/skia/layers/skia.mk

@@ -32,7 +32,7 @@ $(skia_sync_deps):
 SKIA_ARGS:=
 SKIA_ARGS += is_official_build=true
 SKIA_ARGS += skia_enable_tools=false
-SKIA_ARGS += extra_ldflags=[\"-L$(SYSROOT)/usr/local/lib64\"]
+SKIA_ARGS += extra_ldflags=[\"-L$(SYSROOT)/$(PREFIX)/$(LIBDIR)\"]
 SKIA_ARGS += target_os=\"linux\" target_cpu=\"$(SKIA_ARCH)\"
 SKIA_ARGS += skia_use_icu=false
 SKIA_ARGS += skia_use_sfntly=false

recipes/skia/recipe.mk

@@ -1,11 +1,20 @@
 include $(DEFINE_RECIPE)
 SYSROOT?=$(OUT)/sysroot
 
+ifeq ($(CC),cc)
 export CC:=gcc-10
 export CXX:=g++-10
+endif
+
+HOST:=$(shell $(CC) -dumpmachine)
+
+PREFIX:=usr/local
+LIBDIR:=lib
+
+ifeq ($(HOST),x86_64-linux-gnu)
+LIBDIR:=lib64
+endif
 
-PREFIX=usr/local
-LIBDIR=lib64
 export LIBRARY_PATH="$(SYSROOT)/$(PREFIX)/$(LIBDIR):$(SYSROOT)/usr/lib64"
 
 ifneq ($(shell which distcc 2> /dev/null),)

ve-root

@@ -1 +1 @@
-Subproject commit 4b32eeb8a792a7d8859313b32282c924024251ef
+Subproject commit 211fbfe33290a78c400b40e95e4da6a6d69c5151