diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc9690dff..768a84cc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [macos-latest] - build_system: [cmake] + build_system: [autotools, cmake] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4.1.6 diff --git a/CMakeLists.txt b/CMakeLists.txt index fab4fb714..977247af5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1464,12 +1464,16 @@ elseif(BUILD_SHARED_LIBS AND SYMBOL_VERSIONING STREQUAL "generic") ) endif() +math(EXPR liblzma_MACHO_COMPATIBILITY_VERSION + "${xz_VERSION_MAJOR} + ${xz_VERSION_MINOR} + 1") +set(liblzma_MACHO_CURRENT_VERSION + "${liblzma_MACHO_COMPATIBILITY_VERSION}.${xz_VERSION_PATCH}") + set_target_properties(liblzma PROPERTIES - # At least for now the package versioning matches the rules used for - # shared library versioning (excluding development releases) so it is - # fine to use the package version here. SOVERSION "${xz_VERSION_MAJOR}" VERSION "${xz_VERSION}" + MACHO_COMPATIBILITY_VERSION "${liblzma_MACHO_COMPATIBILITY_VERSION}" + MACHO_CURRENT_VERSION "${liblzma_MACHO_CURRENT_VERSION}" # The name liblzma a mess because in many places "lib" is just a prefix # and not part of the actual name. (Don't name a new library this way!) diff --git a/build-aux/ci_build.bash b/build-aux/ci_build.bash index ae57adc2a..83fbd863e 100755 --- a/build-aux/ci_build.bash +++ b/build-aux/ci_build.bash @@ -228,6 +228,8 @@ then echo echo DEBUG echo + ls -ld src/liblzma/.libs/liblzma*dylib* + echo otool -L src/liblzma/.libs/liblzma.5.dylib echo echo DEBUG