try compiling libxml statically

Author: caesay

.github/workflows/build.yml

@@ -34,7 +34,6 @@ jobs:
             ${{ matrix.prefix }}-meson
             ${{ matrix.prefix }}-pkgconf
             ${{ matrix.prefix }}-glib2
-            ${{ matrix.prefix }}-libxml2
             mingw-w64-ucrt-x86_64-vala
             bison
 
@@ -81,14 +80,13 @@ jobs:
             apk add --no-cache \
               gcc musl-dev meson vala bison pkgconf file \
               glib-dev glib-static \
-              libxml2-dev libxml2-static \
               zlib-dev zlib-static \
               pcre2-dev pcre2-static \
               libffi-dev \
               xz-dev xz-static \
               util-linux-dev util-linux-static
             echo "=== Verifying static libs ==="
-            ls /usr/lib/libglib-2.0.a /usr/lib/libgio-2.0.a /usr/lib/libgobject-2.0.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libpcre2-8.a /usr/lib/libffi.a /usr/lib/liblzma.a /usr/lib/libmount.a /usr/lib/libblkid.a
+            ls /usr/lib/libglib-2.0.a /usr/lib/libgio-2.0.a /usr/lib/libgobject-2.0.a /usr/lib/libz.a /usr/lib/libpcre2-8.a /usr/lib/libffi.a /usr/lib/liblzma.a /usr/lib/libmount.a /usr/lib/libblkid.a
             meson setup builddir --default-library=static --prefer-static
             meson compile -C builddir
             file builddir/wixl
@@ -123,30 +121,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install meson vala bison glib libxml2 zlib libffi cmake
+          brew install meson vala bison glib zlib libffi
           echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
 
-      - name: Build static libxml2
-        run: |
-          brew fetch --force libxml2
-          TARBALL=$(brew --cache libxml2)
-          TMPDIR=$(mktemp -d)
-          tar xf "$TARBALL" -C "$TMPDIR"
-          cd "$TMPDIR"/libxml2-*
-          cmake -B build \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DLIBXML2_WITH_PYTHON=OFF \
-            -DLIBXML2_WITH_ICU=OFF \
-            -DLIBXML2_WITH_LZMA=OFF \
-            -DZLIB_ROOT=$(brew --prefix zlib)
-          cmake --build build
-          cp build/libxml2.a "$(brew --prefix libxml2)/lib/"
-
       - name: Build
         run: |
-          export PKG_CONFIG_PATH="$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix zlib)/lib/pkgconfig:$(brew --prefix libffi)/lib/pkgconfig:$PKG_CONFIG_PATH"
-          export LDFLAGS="-L$(brew --prefix zlib)/lib -L$(brew --prefix libffi)/lib -L$(brew --prefix libxml2)/lib"
-          export CPPFLAGS="-I$(brew --prefix libxml2)/include"
+          export PKG_CONFIG_PATH="$(brew --prefix zlib)/lib/pkgconfig:$(brew --prefix libffi)/lib/pkgconfig:$PKG_CONFIG_PATH"
+          export LDFLAGS="-L$(brew --prefix zlib)/lib -L$(brew --prefix libffi)/lib"
           meson setup builddir --default-library=static --prefer-static
           meson compile -C builddir
 

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "libeconf"]
 	path = libeconf
 	url = https://github.com/openSUSE/libeconf.git
+[submodule "libxml2"]
+	path = libxml2
+	url = https://github.com/GNOME/libxml2.git

libxml2

@@ -1,6 +1,6 @@
 project('wixl-standalone', 'c', 'vala',
   version: '0.103',
-  meson_version: '>= 0.62',
+  meson_version: '>= 0.64',
   default_options: [
     'default_library=static',
     'prefer_static=true',
@@ -14,9 +14,112 @@ gnome = import('gnome')
 glib    = dependency('glib-2.0',    version: '>= 2.12', static: true)
 gobject = dependency('gobject-2.0', version: '>= 0.9.4', static: true)
 gio     = dependency('gio-2.0',     version: '>= 2.14', static: true)
-libxml  = dependency('libxml-2.0',  version: '>= 2.7', static: true)
 zlib    = dependency('zlib',        static: true)
 
+# --- libxml2 (static, built from source) ---
+cc = meson.get_compiler('c')
+
+xml2_version_config = configuration_data()
+xml2_version_config.set('VERSION', '2.16.0')
+xml2_version_config.set('LIBXML_VERSION_NUMBER', '21600')
+xml2_version_config.set('LIBXML_VERSION_EXTRA', '')
+xml2_version_config.set('WITH_THREADS', 1)
+xml2_version_config.set('WITH_THREAD_ALLOC', 0)
+xml2_version_config.set('WITH_OUTPUT', 1)
+xml2_version_config.set('WITH_PUSH', 1)
+xml2_version_config.set('WITH_READER', 0)
+xml2_version_config.set('WITH_PATTERN', 0)
+xml2_version_config.set('WITH_WRITER', 0)
+xml2_version_config.set('WITH_SAX1', 0)
+xml2_version_config.set('WITH_HTTP', 0)
+xml2_version_config.set('WITH_VALID', 1)
+xml2_version_config.set('WITH_HTML', 0)
+xml2_version_config.set('WITH_C14N', 0)
+xml2_version_config.set('WITH_CATALOG', 0)
+xml2_version_config.set('WITH_WINPATH', host_machine.system() == 'windows' ? 1 : 0)
+xml2_version_config.set('WITH_XPATH', 0)
+xml2_version_config.set('WITH_XPTR', 0)
+xml2_version_config.set('WITH_XINCLUDE', 0)
+xml2_version_config.set('WITH_ICONV', 1)
+xml2_version_config.set('WITH_ICU', 0)
+xml2_version_config.set('WITH_ISO8859X', 1)
+xml2_version_config.set('WITH_DEBUG', 0)
+xml2_version_config.set('WITH_REGEXPS', 0)
+xml2_version_config.set('WITH_RELAXNG', 0)
+xml2_version_config.set('WITH_SCHEMAS', 0)
+xml2_version_config.set('WITH_SCHEMATRON', 0)
+xml2_version_config.set('WITH_MODULES', 0)
+xml2_version_config.set('WITH_ZLIB', 1)
+xml2_version_config.set('MODULE_EXTENSION', '')
+
+xml2_version_h = configure_file(
+  input: 'libxml2/include/libxml/xmlversion.h.in',
+  output: 'libxml/xmlversion.h',
+  configuration: xml2_version_config,
+)
+
+xml2_config = configuration_data()
+xml2_config.set('HAVE_STDINT_H', 1)
+xml2_config.set01('HAVE_DECL_GETENTROPY', cc.has_function('getentropy', prefix: '#include <sys/random.h>'))
+xml2_config.set01('HAVE_DECL_GLOB', cc.has_function('glob', prefix: '#include <glob.h>'))
+xml2_config.set01('HAVE_DECL_MMAP', cc.has_function('mmap', prefix: '#include <sys/mman.h>'))
+xml2_config.set('HAVE_FUNC_ATTRIBUTE_DESTRUCTOR', cc.compiles('void __attribute__((destructor)) f(void) {} int main(void) { return 0; }') ? 1 : false)
+xml2_config.set('HAVE_DLOPEN', cc.has_function('dlopen') ? 1 : false)
+xml2_config.set('XML_THREAD_LOCAL', '_Thread_local')
+
+xml2_config_h = configure_file(
+  output: 'xml2-config.h',
+  configuration: xml2_config,
+)
+
+xml2_inc_dirs = include_directories(
+  'libxml2',
+  'libxml2/include',
+)
+
+libxml2_sources = files(
+  'libxml2/buf.c',
+  'libxml2/chvalid.c',
+  'libxml2/dict.c',
+  'libxml2/encoding.c',
+  'libxml2/entities.c',
+  'libxml2/error.c',
+  'libxml2/globals.c',
+  'libxml2/hash.c',
+  'libxml2/list.c',
+  'libxml2/parser.c',
+  'libxml2/parserInternals.c',
+  'libxml2/SAX2.c',
+  'libxml2/threads.c',
+  'libxml2/tree.c',
+  'libxml2/uri.c',
+  'libxml2/valid.c',
+  'libxml2/xmlIO.c',
+  'libxml2/xmlmemory.c',
+  'libxml2/xmlstring.c',
+  'libxml2/xmlsave.c',
+)
+
+libxml2_deps = [zlib]
+
+libxml2 = static_library('xml2',
+  libxml2_sources,
+  xml2_config_h,
+  xml2_version_h,
+  include_directories: xml2_inc_dirs,
+  dependencies: libxml2_deps,
+  c_args: [
+    '-include', meson.project_build_root() / 'xml2-config.h',
+  ],
+)
+
+libxml = declare_dependency(
+  link_with: libxml2,
+  include_directories: xml2_inc_dirs,
+  dependencies: libxml2_deps,
+  sources: xml2_version_h,
+)
+
 add_project_arguments('-w', language: 'c')
 
 if host_machine.system() == 'windows'
@@ -252,7 +355,6 @@ libmsi_dep = declare_dependency(
 
 # --- Platform-specific dependencies and link args ---
 platform_link_deps = []
-platform_extra_deps = []
 
 if host_machine.system() == 'linux'
   libeconf = static_library('econf',
@@ -325,7 +427,7 @@ wixl = executable('wixl',
   c_args: ['-include', meson.project_build_root() / 'config.h'],
   include_directories: [inc_dirs, gcab_inc_dirs],
   link_with: [libcommon] + platform_link_deps,
-  dependencies: [libmsi_dep, libgcab_dep, glib, gio, libxml] + platform_extra_deps,
+  dependencies: [libmsi_dep, libgcab_dep, glib, gio, libxml],
   link_args: platform_link_args,
   install: true,
 )