From: Matthew Leibowitz Date: Sat, 10 Mar 2018 06:35:36 +0000 (+0200) Subject: Making the build work on linux X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~13^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb590260645de8b51e93201cb6828b4a6500ff52;p=platform%2Fupstream%2FlibSkiaSharp.git Making the build work on linux --- diff --git a/BUILD.gn b/BUILD.gn index 53477bc..0d4fd79 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -432,9 +432,11 @@ optional("gpu") { libs += [ "EGL" ] } else if (is_linux) { sources += [ "src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp" ] + # GPU is not linked in, but loaded at runtime libs += [ - "GL", - "GLU", + # "GL", + # "GLU", + "dl", ] } else if (is_mac) { sources += [ "src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp" ] diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 0d78ccc..559aead 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -698,6 +698,9 @@ toolchain("gcc_like") { tool("solink") { soname = "{{target_output_name}}{{output_extension}}" + if (linux_soname_version != "") { + soname += ".$linux_soname_version" + } rpath = "-Wl,-soname,$soname" if (is_mac) { diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 334deb6..6e1d00b 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -16,6 +16,7 @@ declare_args() { } else { ndk_api = 21 } + linux_soname_version = "" sanitize = "" } declare_args() {