From b417246ae2b0015d1e44e5fa921b7d46077b6d84 Mon Sep 17 00:00:00 2001 From: bgermann Date: Sat, 15 Sep 2018 23:52:45 +0200 Subject: [PATCH] Add musl-based alpine to CI --- .gitlab-ci.yml | 17 +++++++++++++++++ acinclude.m4 | 5 +++++ gb.crypt/configure.ac | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8092f18d0..23098d201 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,3 +118,20 @@ build:ubuntu-trusty: - ./configure -C - make -j$(nproc) - make install + +build:alpine: + image: alpine + before_script: + - > + apk add --no-progress -q + autoconf automake curl-dev dbus-dev g++ gdk-pixbuf-dev git gmp-dev + glew-dev glib-dev gmime-dev gsl-dev gst-plugins-base-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev + gtkglext-dev imlib2-dev gettext-dev libffi-dev mesa-dev libgnome-keyring-dev mariadb-dev librsvg-dev + libsm-dev libxcursor-dev libxml2-dev libxslt-dev libxtst-dev make ncurses-dev pcre-dev pkgconf + poppler-dev postgresql-dev qt5-qtsvg-dev qt5-qtwebkit-dev qt5-qtx11extras-dev sdl2-dev sdl2_image-dev + sdl2_mixer-dev sdl2_ttf-dev sdl_mixer-dev sqlite-dev unixodbc-dev xdg-utils zlib-dev + script: + - ./reconf-all + - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-openal --disable-qt4 --disable-sdl --disable-sqlite2 --disable-v4l + - make -j$(nproc) + - make install diff --git a/acinclude.m4 b/acinclude.m4 index 48fd8bdbc..e397ec649 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -558,6 +558,11 @@ AC_DEFUN([GB_SYSTEM], AC_DEFINE(OS_LINUX, 1, [Target system is Linux]) AC_DEFINE(SYSTEM, "Linux", [Operating system]) ;; + *-*-linux* ) + SYSTEM=LINUX + AC_DEFINE(OS_LINUX, 1, [Target system is Linux]) + AC_DEFINE(SYSTEM, "Linux", [Operating system]) + ;; *-*-freebsd* ) SYSTEM=FREEBSD AC_DEFINE(OS_BSD, 1, [Target system is of BSD family]) diff --git a/gb.crypt/configure.ac b/gb.crypt/configure.ac index 7191d00e1..4c88b6383 100644 --- a/gb.crypt/configure.ac +++ b/gb.crypt/configure.ac @@ -10,7 +10,7 @@ AC_PROG_LIBTOOL GB_COMPONENT( crypt, CRYPT, gb.crypt, [src], [], - [GB_FIND(libcrypt.$SHLIBEXT, $prefix /usr/local /usr, lib)], + [], [-lcrypt]) AC_OUTPUT( \