Skip to content

Commit

Permalink
fix: support patchelf option when clang/llvm toolchain is used
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Sep 3, 2024
1 parent 54bcda8 commit 473729d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gem-test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ concurrency:
cancel-in-progress: true

env:
CACHE_VER: 06
CACHE_VER: 07
DEBIAN_FRONTEND: "noninteractive"
TZ: "Etc/UTC"
# show cmake output
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
gem: [ metanorma, fontist ]
package_ruby_ver: [ '3.2.5' ]
env:
- { CC: gcc-10, CXX: g++-10 }
- { CC: clang-12, CXX: clang++-12 }
env: ${{ matrix.env }}
steps:
- name: Download actions
Expand Down
8 changes: 2 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,7 @@ set(WITH_PATCHELF OFF)
if("${OSTYPE_TXT}" MATCHES "^linux-gnu.*")
set(IS_GNU ON)
if(REMOVE_GLIBC_PRIVATE)
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
set(WITH_PATCHELF ON)
else()
message(WARNING "Elf file patching is supported for GNU toolchain only. 'patchelf' setting ignored")
endif()
set(WITH_PATCHELF ON)
endif(REMOVE_GLIBC_PRIVATE)
elseif("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
set(IS_MUSL ON)
Expand Down Expand Up @@ -216,7 +212,7 @@ string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
def_ext_prj_g(DWARFS_WR "v0.5.9")
#endif(DWARFS_PRELOAD)

def_ext_prj_g(PATCHELF "master")
def_ext_prj_g(PATCHELF "65e14792061c298f1d2bc44becd48a10cbf0bc81")

set(LIBYAML_RUBY_OPTION "")
if(${RUBY_VER} VERSION_LESS "3.2.0")
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,8 @@ packaging consistency checks are relaxed.

`patchelf`::
flag that removal a reference to GLIBC_PRIVATE version of libpthread from tebako package. This allows Linux Gnu packages to run against versions of
libpthread that differ from the version used for packaging. For example, package created at Ubuntu 20 system can be used on Ubuntu 22. This option works on Gnu Linux with
Gnu toolchain only (not for LLVM/clang). The feature is exeprimental, we may consider other approach in the future.
libpthread that differ from the version used for packaging. For example, package created at Ubuntu 20 system can be used on Ubuntu 22. This option makes
sense and works on Gnu Linux only. The feature is exeprimental, we may consider other approach in the future.

`tebafile`::
the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
Expand Down
2 changes: 1 addition & 1 deletion lib/tebako/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
# POSSIBILITY OF SUCH DAMAGE.

module Tebako
VERSION = "0.8.6"
VERSION = "0.8.7"
end

0 comments on commit 473729d

Please sign in to comment.