switch termux docker image provider to a maintained one

.cirrus.yml

@@ -69,13 +69,3 @@ task:
   setup_script:
     - pkg install -y meson ninja gcc
   << : *common_script
-
-task:
-  container:
-    image: kcubeterm/termux:x86_64
-    kvm: true
-  name: bionic
-  setup_script:
-    - pkg install -y ninja clang python
-    - pip install meson
-  << : *common_script

.github/workflows/build-and-test.yml

@@ -19,6 +19,27 @@ on: [push, pull_request]
 # copypasted between jobs. You'll probably want to read the 'glibc:' task first,
 # it's the one that requires the least hacks.
 jobs:
+  bionic:
+    # XXX: Checkout and upload actions don't work, work with termux to fix this
+    # and the need to run /entrypoint.sh ourselves.
+    runs-on: ubuntu-latest
+    container: termux/termux-docker:x86_64
+    steps:
+      - name: setup
+        run: |
+          /entrypoint.sh pkg install -y ninja clang python git
+          /entrypoint.sh pip install meson
+          git clone --depth 1 -b $GITHUB_REF_NAME \
+              https://github.com/$GITHUB_REPOSITORY
+      - name: build
+        run: |
+          meson setup -Dtest_system=true build libobsd
+          meson compile -C build
+      - name: test
+        run: meson test --no-suite system -C build
+      - name: test_system
+        run: meson test --suite system -C build || true
+
   dietlibc:
     runs-on: ubuntu-latest
     steps:

meson.build

@@ -44,10 +44,10 @@ elif cc.has_header_symbol('features.h', '__dietlibc__')
   cxx_support = false
 elif cc.has_header_symbol('features.h', '__NEWLIB__') or \
      cc.has_header_symbol('features.h', '__BIONIC__') or \
-     cc.has_header_symbol('features.h', '__GLIBC__') or \
      cc.has_header_symbol('features.h', '_GNU_SOURCE',
-                          prefix: '''#define _ALL_SOURCE\n#undef _GNU_SOURCE''')
-
+                          prefix:
+                          '''#define _ALL_SOURCE\n#undef _GNU_SOURCE''') or \
+     cc.has_header_symbol('features.h', '__GLIBC__')
   # Some libcs (e.g. uClibc-ng) might set __GLIBC__ in features.h to try to
   # imitate glibc. Make sure we test for __GLIBC__ last for this reason. If the
   # library exposes everything when _GNU_SOURCE is set, then it really does