Add libsass 3.6.4

subprojects/packagefiles/libsass/meson.build

@@ -11,11 +11,6 @@ add_project_arguments(
   '-DLIBSASS_VERSION="@0@"'.format(meson.project_version()),
   language: ['cpp'])
 
-cpp = meson.get_compiler('cpp')
-add_project_arguments(
-  cpp.get_supported_arguments('-Wno-non-virtual-dtor'),
-  language: ['cpp'])
-
 inc = include_directories('include')
 winres_path = files(join_paths('res', 'resource.rc'))
 

subprojects/packagefiles/libsass/src/meson.build

@@ -76,14 +76,18 @@ if host_machine.system() == 'windows'
   sass_sources += [windows.compile_resources(winres_path)]
 endif
 
-if meson.version().version_compare('>= 0.62')
-  dl_dep = dependency('dl', required : false)
+if host_machine.system() != 'windows'
+  if meson.version().version_compare('>= 0.62')
+    dl_dep = dependency('dl')
+  else
+    dl_dep = cc.find_library('dl', required : false)
+  endif
 else
-  dl_dep = cc.find_library('dl', required : false)
+  dl_dep = declare_dependency()
 endif
 
 lib_args = []
-if get_option('default_library') != 'static'
+if host_machine.system() == 'windows' and get_option('default_library') != 'static'
   lib_args += ['-DADD_EXPORTS']
 endif
 
@@ -94,23 +98,17 @@ libsass = library(
    c_args: lib_args,
    cpp_args: lib_args,
    include_directories: inc,
+   soversion: '1',
    install: true)
 
 libsass_dep = declare_dependency(
   link_with: libsass,
   include_directories: [inc])
 
-conf_data = configuration_data()
-conf_data.set('prefix', get_option('prefix'))
-conf_data.set('exec_prefix', '${prefix}')
-conf_data.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
-conf_data.set('includedir', join_paths('${prefix}', get_option('includedir')))
-conf_data.set('VERSION', meson.project_version())
-
-pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
-
-configure_file(
-  input: 'support/libsass.pc.in',
-  output: 'libsass.pc',
-  configuration: conf_data,
-  install_dir: pkg_install_dir)
+pkg = import('pkgconfig')
+pkg.generate(
+  libsass,
+  name: 'libsass',
+  description: 'A C implementation of a Sass compiler',
+  url: 'https://github.com/sass/libsass',
+)