8 files changed, 2 insertions(+), 106 deletions(-)
M .gitlab-ci.yml
M VERSION
D meson/arm-linux-gnueabihf
D meson/i686-linux-gnu
D meson/i686-w64-mingw32
D meson/universal-apple-darwin
D meson/x86_64-linux-gnu
D meson/x86_64-w64-mingw32
M .gitlab-ci.yml => .gitlab-ci.yml +1 -1
@@ 19,7 19,7 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - meson --prefix=/ --cross-file "${TOOLCHAIN_FILE}" -Dstatic-build=false build
+ - meson --prefix=/ -Dstatic-build=false build
- ninja -C build
- DESTDIR="${CI_PROJECT_DIR}/${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" ninja -C build install
M VERSION => VERSION +1 -1
@@ 1,1 1,1 @@
-0.11.5
+0.11.11
D meson/arm-linux-gnueabihf => meson/arm-linux-gnueabihf +0 -18
@@ 1,18 0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'arm'
-cpu = 'armv7hl'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/arm-linux-gnueabihf-gcc'
-cpp = '/usr/bin/arm-linux-gnueabihf-cpp'
-ar = '/usr/bin/arm-linux-gnueabihf-ar'
-strip = '/usr/bin/arm-linux-gnueabihf-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/qemu-arm'
-
-[properties]
-root = '/usr/arm-linux-gnueabihf'
-c_link_args = ['-Wl,-z,defs']
-needs_exe_wrapper = true
D meson/i686-linux-gnu => meson/i686-linux-gnu +0 -17
@@ 1,17 0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'x86'
-cpu = 'i686'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-linux-gnu-gcc'
-cpp = '/usr/bin/x86_64-linux-gnu-g++'
-ar = '/usr/bin/x86_64-linux-gnu-ar'
-strip = '/usr/bin/x86_64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-c_args = ['-m32']
-c_link_args = ['-m32', '-Wl,-z,defs']
-needs_exe_wrapper = false
D meson/i686-w64-mingw32 => meson/i686-w64-mingw32 +0 -17
@@ 1,17 0,0 @@
-[host_machine]
-system = 'windows'
-cpu_family = 'i686'
-cpu = 'i686'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/i686-w64-mingw32-gcc'
-cpp = '/usr/bin/i686-w64-mingw32-c++'
-ar = '/usr/bin/i686-w64-mingw32-ar'
-strip = '/usr/bin/i686-w64-mingw32-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/wine'
-
-[properties]
-root = '/usr/i686-w64-mingw32'
-needs_exe_wrapper = true
D meson/universal-apple-darwin => meson/universal-apple-darwin +0 -19
@@ 1,19 0,0 @@
-[host_machine]
-system = 'darwin'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang'
-cpp = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang++'
-objc = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang'
-ar = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-ar'
-strip = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-root = '/usr/universal-apple-darwin/SDK/MacOSX10.11.sdk'
-c_args = ['-arch', 'i386', '-arch', 'x86_64']
-c_link_args = ['-arch', 'i386', '-arch', 'x86_64']
-needs_exe_wrapper = true
D meson/x86_64-linux-gnu => meson/x86_64-linux-gnu +0 -16
@@ 1,16 0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-linux-gnu-gcc'
-cpp = '/usr/bin/x86_64-linux-gnu-g++'
-ar = '/usr/bin/x86_64-linux-gnu-ar'
-strip = '/usr/bin/x86_64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-c_link_args = ['-Wl,-z,defs']
-needs_exe_wrapper = false
D meson/x86_64-w64-mingw32 => meson/x86_64-w64-mingw32 +0 -17
@@ 1,17 0,0 @@
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-w64-mingw32-gcc'
-cpp = '/usr/bin/x86_64-w64-mingw32-c++'
-ar = '/usr/bin/x86_64-w64-mingw32-ar'
-strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/wine64'
-
-[properties]
-root = '/usr/x86_64-w64-mingw32'
-needs_exe_wrapper = true