diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 257fa988..909f9a4f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,7 +2,6 @@ name: check-macos on: push: branches: [ "macos" ] - tags: [ "*" ] pull_request: branches: [ "master" ] @@ -27,19 +26,4 @@ jobs: export PKG_CONFIG_PATH="$(brew --prefix curl)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig" meson setup --prefix=$(brew --prefix)/Cellar/lib3270/${{ steps.gettag.outputs.tag }} .build meson compile -C .build - - name: package - run: | - DESTDIR=${PWD}/.bin/package meson install -C .build - tar --create --verbose --xz --file=macos-lib3270.tar.xz --directory=${PWD}/.bin/package/$(brew --prefix)/Cellar --verbose . - - name: upload - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.gettag.outputs.tag }} - artifacts: "macos-lib3270.tar.xz" - allowUpdates: true - draft: false - makeLatest: true - omitBody: true - omitPrereleaseDuringUpdate: true - replacesArtifacts: true diff --git a/meson.build b/meson.build index b4503072..d649231a 100644 --- a/meson.build +++ b/meson.build @@ -52,11 +52,12 @@ subdir('po') # c = meson.get_compiler('c') -libssl = dependency('libssl', required: false) +libssl = dependency('OpenSSL', required: false) libintl = dependency('intl', required : false) libiconv = dependency('iconv', required : false) lib_extra = [ + dependency('threads'), libintl, libiconv ] @@ -84,7 +85,6 @@ cc = meson.get_compiler('c') compiler_flags = [ '-ggdb3', - '-pthread', '-DHAVE_CONFIG_H=1', '-DBUILD_DATE='+time_epoch, ]