[LIB] Renamed test project to libavalonia.skia

docker/skiabuild/docker-compose.yml

@@ -17,6 +17,7 @@ services:
       - CURRENT_GID
       - CURRENT_USER
       - CURRENT_DIR
+      - DISTCC_HOSTS
       - TERM=xterm-256color
     hostname: skiabuild
     stdin_open: true

docker/skiabuild/entrypoint.sh

@@ -8,5 +8,5 @@ usermod -a -G wheel ${CURRENT_USER}
 echo "root   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 echo "${CURRENT_USER}   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-exec sudo -i -u ${CURRENT_USER} /userentry.sh ${CURRENT_DIR} $@
+exec sudo -E -u ${CURRENT_USER} /userentry.sh ${CURRENT_DIR} $@
 

recipes/skia/layers/avalonia_skia.mk

@@ -1,13 +1,13 @@
 LAYER:=avalonia_skia
 include $(DEFINE_LAYER)
 
-$(call meson_srcdir, avalonia_skia, $(BASE)/test)
+$(call meson_srcdir, avalonia_skia, $(BASE)/libavalonia.skia)
 
 DEPENDS += skia
 
 include $(BUILD_LAYER)
 
-$(L): $(BASE)/test/meson.build
+$(L): $(BASE)/libavalonia.skia/meson.build
 
 
 $(L).clean:

recipes/skia/layers/skia.mk

@@ -65,6 +65,5 @@ $(skia_install): $(skia)
 $(skia_pkgconfig): $(skia_install)
 	cp $(BASE_skia)/skia.pc.in $@
 
-
 $(L).clean:
 	rm -rf $(builddir)

recipes/skia/recipe.mk

@@ -22,13 +22,15 @@ endif
 
 export LIBRARY_PATH="$(SYSROOT)/$(PREFIX)/$(LIBDIR):$(SYSROOT)/usr/lib64"
 
+BUILD_JOBS:=-j$(shell nproc)
+
 ifneq ($(shell which distcc 2> /dev/null),)
 ifdef DISTCC_HOSTS
 export CC:=distcc $(CC)
 export CXX:=distcc $(CXX)
 export CLANG:=distcc $(CLANG)
 export CLANGXX:=distcc $(CLANGXX)
-BUILD_JOBS=-j $$(distcc -j)
+BUILD_JOBS=-j$$(distcc -j)
 endif
 endif