[SKIA] Improved build-flags.

docker/skiabuild/Dockerfile

@@ -32,7 +32,6 @@ RUN yum install -y  tar \
                     openssl-devel \
                     perl-devel \
                     zlib-devel \
-                    mesa-libGL-devel \
                     gperf \
                     gettext-devel \
                     expat-devel \
@@ -41,7 +40,9 @@ RUN yum install -y  tar \
                     flex \
                     bison \
                     texinfo \
-                    which
+                    which \
+                    pax-utils \
+                    make
 
 
 RUN pip3 install cmake ninja meson
@@ -65,7 +66,7 @@ RUN git clone --depth=1 -b binutils-2_38 https://github.com/bminor/binutils-gdb
 RUN mkdir -p binutils-gdb/build
 
 RUN cd binutils-gdb/build && ../configure CC='distcc gcc-4.8.5' CXX='distcc g++-4.8.5' --disable-shared --disable-gdb --disable-sim --disable-nls --enable-multilib --enable-multiarch
-ENV DISTCC_HOSTS="10.1.0.16/1 10.1.0.24/32 10.1.0.32/8 10.1.0.40/20 10.1.0.48/16"
+ENV DISTCC_HOSTS="10.1.0.16/4 10.1.0.24/32 10.1.0.40/20 10.1.0.48/20"
 RUN cd binutils-gdb/build && make -j$(distcc -j)
 RUN cd binutils-gdb/build && make install
 
@@ -90,7 +91,6 @@ RUN cd build && CC="distcc gcc-10" CXX="distcc g++-10" cmake \
                 -DLLVM_ENABLE_PROJECTS=clang \
                 -G "Ninja" ../llvm
 
-ENV DISTCC_HOSTS="10.1.0.16/8 10.1.0.24/14 10.1.0.40/20 10.1.0.48/16"
 RUN cd build && ninja -j$(distcc -j)
 RUN cd build && DESTDIR=$(pwd)/out ninja install
 RUN cd build && ninja install
@@ -140,7 +140,7 @@ COPY --from=toolchains freetype/out/ /
 COPY --from=toolchains fontconfig/out/ /
 COPY --from=toolchains gn/out/gn /usr/bin/gn
 
-RUN yum -y install mesa-libGL-devel.i686 glibc-devel.i686 make
+RUN yum -y install glibc-devel.i686
 
 RUN mkdir -p /usr/local/git/share/git-core/templates
 

libavalonia.skia/CMakeLists.txt

@@ -12,9 +12,11 @@ pkg_check_modules(PKG_SKIA REQUIRED IMPORTED_TARGET skia)
 add_library(avalonia.skia SHARED avalonia.skia.cpp)
 target_include_directories(avalonia.skia PRIVATE ${PKG_SKIA_INCLUDE_DIRS})
 target_link_libraries(avalonia.skia PRIVATE PkgConfig::PKG_SKIA)
-set_target_properties(avalonia.skia PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libavalonia.skia.version)
-set (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--version-script=${CMAKE_SOURCE_DIR}/libavalonia.skia.version")
-
+target_link_options(avalonia.skia PRIVATE "-Wl,--version-script=${CMAKE_SOURCE_DIR}/libavalonia.skia.version")
+target_link_options(avalonia.skia PRIVATE "-static-libgcc")
+target_link_options(avalonia.skia PRIVATE "-static-libstdc++")
+target_compile_options(avalonia.skia PRIVATE "-static-libstdc++")
+target_compile_options(avalonia.skia PRIVATE "-static-libgcc")
 
 add_executable(avalonia.skia.testprog testprog.c)
 

recipes/skia/layers/avalonia_skia.mk

@@ -3,13 +3,12 @@ include $(DEFINE_LAYER)
 
 avalonia_skia:=$(LSTAMP)/avalonia.skia
 avalonia_symbols:=$(PKGROOT)/libavalonia.skia.symbols
+avalonia_lddtree:=$(PKGROOT)/libavalonia.skia.lddtree
 avalonia_install:=$(LSTAMP)/avalonia_install
 
-#$(call meson_srcdir, avalonia_skia, $(BASE)/libavalonia.skia)
-
 $(L) += $(avalonia_skia)
 $(L) += $(avalonia_symbols)
-$(L) += $(avalonia_install)
+$(L) += $(avalonia_lddtree)
 
 DEPENDS += skia
 
@@ -28,5 +27,8 @@ $(avalonia_skia):
 $(avalonia_symbols): $(avalonia_skia)
 	nm $(PKGROOT)/$(PREFIX)/$(LIBDIR)/libavalonia.skia.so | grep '.*\sT\s.*$$' > $@
 
+$(avalonia_lddtree): $(avalonia_skia)
+	lddtree $(PKGROOT)/$(PREFIX)/$(LIBDIR)/libavalonia.skia.so > $@
+
 $(L).clean:
 	rm -rf $(builddir)

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)/$(PREFIX)/$(LIBDIR)\"]
+SKIA_ARGS += extra_ldflags=[\"-L$(SYSROOT)/$(PREFIX)/$(LIBDIR)\", \"-static-libstdc++\", \"-static-libgcc\" ]
 SKIA_ARGS += target_os=\"linux\" target_cpu=\"$(SKIA_ARCH)\"
 SKIA_ARGS += skia_use_icu=false
 SKIA_ARGS += skia_use_sfntly=false
@@ -43,6 +43,7 @@ SKIA_ARGS += skia_use_system_libjpeg_turbo=false
 SKIA_ARGS += skia_use_system_libpng=false
 SKIA_ARGS += skia_use_system_libwebp=false
 SKIA_ARGS += skia_use_system_zlib=false
+SKIA_ARGS += skia_use_x11=false
 SKIA_ARGS += skia_enable_gpu=true
 SKIA_ARGS += cc=\"$(CLANG)\"
 SKIA_ARGS += cxx=\"$(CLANGXX)\"

recipes/skia/layers/skia.pc.in

@@ -10,6 +10,6 @@ cachedir=${localstatedir}/cache/fontconfig
 Name: Skia
 Version: 1.0
 Description: Skia graphics library
-Libs: -L${libdir} -lskia -lGL -lfontconfig -lpthread
+Libs: -L${libdir} -lskia -lfontconfig -lpthread
 Cflags: -I${includedir}
 

ve-root

@@ -1 +1 @@
-Subproject commit 211fbfe33290a78c400b40e95e4da6a6d69c5151
+Subproject commit ce09b81e58ef1575d9e5d0997ef4282d641b0426