diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-11-09 12:25:21 +0100 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-11-09 12:25:21 +0100 |
| commit | 7c0862cf4f78d7cad5e24e048d86ad52a1a0438d (patch) | |
| tree | 7a920d18801319c7e5fa2cdc52c9a74e026695e7 | |
| parent | 97c8ef03777e72cfc392234b0f6031a1c0c47944 (diff) | |
| download | nuk.lv2-7c0862cf4f78d7cad5e24e048d86ad52a1a0438d.tar.xz | |
gitlab: fix ci recipe for darwin.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rwxr-xr-x | docker_build.sh | 37 |
3 files changed, 20 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5b7669..295c0c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: <<: *common_definition script: - meson --prefix="/opt/${CI_BUILD_NAME}" --libdir="lib" --cross-file "${CI_BUILD_NAME}" -Db_lto=false build - - sed -i -e '/framework/s/-Wl,-O1//g' -e '/framework/s/-Wl,--start-group//g' -e '/framework/s/-Wl,--end-group//g' build/build.ninja + - sed -i -e '/framework/s/-Wl,-O1//g' -e '/framework/s/-Wl,--start-group//g' -e '/framework/s/-Wl,--end-group//g' -e '/framework/s/-Wl,-soname,.*dylib//g' build/build.ninja - ninja -C build - ninja -C build install - mkdir -p "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" @@ -1 +1 @@ -0.1.2933 +0.1.2935 diff --git a/docker_build.sh b/docker_build.sh index de81093..0078b21 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -1,24 +1,23 @@ #!/bin/bash -TARGET=$1 - -CI_PROJECT_DIR=$(pwd) -CI_BUILD_NAME=${TARGET} - BASE_NAME="nuk.lv2" +CI_BUILD_NAME=$1 +CI_BUILD_DIR="build-${CI_BUILD_NAME}" + PKG_CONFIG_PATH="/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig" -TOOLCHAIN_FILE="${CI_PROJECT_DIR}/cmake/${CI_BUILD_NAME}.cmake" -rm -rf ${TARGET} -mkdir -p ${TARGET} -pushd ${TARGET} - PKG_CONFIG_PATH=${PKG_CONFIG_PATH} cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} \ - -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" \ - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \ - .. - make -j4 - make install - #ARGS='-VV' make test -popd +rm -rf ${CI_BUILD_DIR} +PKG_CONFIG_PATH=${PKG_CONFIG_PATH} meson \ + --prefix="/opt/${CI_BUILD_NAME}" \ + --libdir="lib" \ + --cross-file ${CI_BUILD_NAME} ${CI_BUILD_DIR} \ + -Db_lto=false -Db_lundef=true -Db_asneeded=true + +sed -i \ + -e '/framework/s/-Wl,-O1//g' \ + -e '/framework/s/-Wl,--start-group//g' \ + -e '/framework/s/-Wl,--end-group//g' \ + -e '/framework/s/-Wl,-soname,.*dylib//g' \ + ${CI_BUILD_DIR}/build.ninja + +ninja -C ${CI_BUILD_DIR} |