From 6a2aa756cabce8b0fb068d428318255244fc1b74 Mon Sep 17 00:00:00 2001
From: Armin Friedl <dev@friedl.net>
Date: Sun, 23 Feb 2020 20:56:29 +0100
Subject: [PATCH] Switch to glibc build

---
 .drone.yml      | 20 ++++++++++----------
 src/meson.build |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e9b25c8..c69f3d5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,20 +20,20 @@ type: docker
 name: release
 
 steps:
-- name: build-musl
+- name: build
   image: arminfriedl/xwim-build
   commands:
-    - LDFLAGS="-static-libstdc++ -static-libgcc" meson --buildtype=release build
+    - meson --buildtype=release build
     - ninja -C build
-    - mkdir xwim-${DRONE_TAG}-x86_64-musl-linux
-    - mv build/src/xwim xwim-${DRONE_TAG}-x86_64-musl-linux
+    - mkdir xwim-${DRONE_TAG}-x86_64-glibc-linux
+    - mv build/src/xwim xwim-${DRONE_TAG}-x86_64-glibc-linux
 
 - name: package
   image: arminfriedl/xwim-build
   commands:
-    - tar cjf xwim-${DRONE_TAG}-x86_64-musl-linux.tar.bz2 xwim-${DRONE_TAG}-x86_64-musl-linux/xwim
-    - tar czf xwim-${DRONE_TAG}-x86_64-musl-linux.tar.gz xwim-${DRONE_TAG}-x86_64-musl-linux/xwim
-    - zip -r xwim-${DRONE_TAG}-x86_64-musl-linux.zip xwim-${DRONE_TAG}-x86_64-musl-linux
+    - tar cjf xwim-${DRONE_TAG}-x86_64-glibc-linux.tar.bz2 xwim-${DRONE_TAG}-x86_64-glibc-linux/xwim
+    - tar czf xwim-${DRONE_TAG}-x86_64-glibc-linux.tar.gz xwim-${DRONE_TAG}-x86_64-glibc-linux/xwim
+    - zip -r xwim-${DRONE_TAG}-x86_64-glibc-linux.zip xwim-${DRONE_TAG}-x86_64-glibc-linux
 
 - name: publish
   image: plugins/gitea-release
@@ -42,9 +42,9 @@ steps:
     api_key:
       from_secret: gitea_token
     files:
-      - xwim-${DRONE_TAG}-x86_64-musl-linux.tar.bz2
-      - xwim-${DRONE_TAG}-x86_64-musl-linux.tar.gz
-      - xwim-${DRONE_TAG}-x86_64-musl-linux.zip
+      - xwim-${DRONE_TAG}-x86_64-glibc-linux.tar.bz2
+      - xwim-${DRONE_TAG}-x86_64-glibc-linux.tar.gz
+      - xwim-${DRONE_TAG}-x86_64-glibc-linux.zip
     title: xwim ${DRONE_TAG}
     checksum:
       - md5
diff --git a/src/meson.build b/src/meson.build
index bfebd28..b9f9f7e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,7 +8,7 @@ inc = ['archive.hpp',
        'fileformats.hpp']
 
 libs = [dependency('libarchive', required: true),
-        dependency('fmt', required: true),
-        dependency('spdlog', required: true)]
+        dependency('fmt', required: true, static: true),
+        dependency('spdlog', required: true, static: true)]
 
 executable('xwim', src, inc, dependencies: libs)