aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 22:08:43 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 22:08:43 +0200
commit1d9048b1d58d976d3d7107a83a65d3c3025018d0 (patch)
tree8b2239c87883ab073ead870c95a6ad3dabc55806
parentc752593553c2801c50cb2745bce3a44eeb38c3aa (diff)
downloadsynthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.zip
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.gz
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.bz2
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.xz
use gitlab CI provided meson toolchain
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--VERSION2
-rw-r--r--meson/arm-linux-gnueabihf18
-rw-r--r--meson/i686-linux-gnu19
-rw-r--r--meson/i686-w64-mingw3217
-rw-r--r--meson/universal-apple-darwin19
-rw-r--r--meson/x86_64-linux-gnu16
-rw-r--r--meson/x86_64-w64-mingw3217
8 files changed, 2 insertions, 109 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 858acc4..e2f301e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
variables:
BASE_NAME: "synthpod"
PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
- TOOLCHAIN_FILE: "${CI_PROJECT_DIR}/meson/${CI_BUILD_NAME}"
.common_template: &common_definition
<<: *variables_definition
@@ -19,7 +18,7 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - meson --prefix="/" --libdir="lib" --cross-file "${TOOLCHAIN_FILE}" build
+ - meson --prefix="/" --libdir="lib" --cross-file "${CI_BUILD_NAME}" build
- ninja -C build
- DESTDIR="${CI_PROJECT_DIR}/${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" ninja -C build install
diff --git a/VERSION b/VERSION
index 24b7b95..52c65cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.5717
+0.1.5723
diff --git a/meson/arm-linux-gnueabihf b/meson/arm-linux-gnueabihf
deleted file mode 100644
index 241266e..0000000
--- a/meson/arm-linux-gnueabihf
+++ /dev/null
@@ -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-g++'
-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
diff --git a/meson/i686-linux-gnu b/meson/i686-linux-gnu
deleted file mode 100644
index 17d5a41..0000000
--- a/meson/i686-linux-gnu
+++ /dev/null
@@ -1,19 +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']
-cpp_args = ['-m32']
-c_link_args = ['-m32', '-Wl,-z,defs']
-cpp_link_args = ['-m32', '-Wl,-z,defs']
-needs_exe_wrapper = false
diff --git a/meson/i686-w64-mingw32 b/meson/i686-w64-mingw32
deleted file mode 100644
index 4966ba7..0000000
--- a/meson/i686-w64-mingw32
+++ /dev/null
@@ -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-g++'
-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
diff --git a/meson/universal-apple-darwin b/meson/universal-apple-darwin
deleted file mode 100644
index 0ee2e02..0000000
--- a/meson/universal-apple-darwin
+++ /dev/null
@@ -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
diff --git a/meson/x86_64-linux-gnu b/meson/x86_64-linux-gnu
deleted file mode 100644
index b09321c..0000000
--- a/meson/x86_64-linux-gnu
+++ /dev/null
@@ -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
diff --git a/meson/x86_64-w64-mingw32 b/meson/x86_64-w64-mingw32
deleted file mode 100644
index 40c8a32..0000000
--- a/meson/x86_64-w64-mingw32
+++ /dev/null
@@ -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-g++'
-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