flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler: Upgrade from CentOS 7 to AlmaLinux 8 (#11371) 

CentOS 7 became end-of-life on July 1st and is no longer working. We now
dynamically link against libstdc++, as RHEL 8 doesn't support static
linking: https://access.redhat.com/articles/rhel8-abi-compatibility

We now use objdump in check-artifact for all linux architectures. This
avoids using a mix of objdump and ldd. ldd shows transitive
dependencies, which is less convenient.

Co-authored-by: Eric Anderson <ejona@google.com>
This commit is contained in:
Larry Safran 2024-07-10 14:12:55 -07:00 committed by GitHub
parent 1d0bff26a5
commit 29f7aeb107
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildscripts/grpc-java-artifacts/Dockerfile
View File

@ -1,17 +1,15 @@
FROM centos:7.9.2009 FROM almalinux:8
RUN yum install -y \ RUN yum install -y \
autoconf \ autoconf \
automake \ automake \
diffutils \
gcc-c++ \ gcc-c++ \
gcc-c++.i686 \
glibc-devel \ glibc-devel \
glibc-devel.i686 \ glibc-devel.i686 \
java-11-openjdk-devel \ java-11-openjdk-devel \
libstdc++-devel \ libstdc++-devel \
libstdc++-devel.i686 \ libstdc++-devel.i686 \
libstdc++-static \
libstdc++-static.i686 \
libtool \ libtool \
make \ make \
tar \ tar \

1
compiler/build.gradle
View File

@ -117,7 +117,6 @@ model {
// Link other (system) libraries dynamically. // Link other (system) libraries dynamically.
// Clang under OSX doesn't support these options. // Clang under OSX doesn't support these options.
linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-static-libgcc", linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-static-libgcc",
"-static-libstdc++",
"-Wl,-Bdynamic", "-lpthread", "-s" "-Wl,-Bdynamic", "-lpthread", "-s"
} }
addEnvArgs("LDFLAGS", linker.args) addEnvArgs("LDFLAGS", linker.args)

19
compiler/check-artifact.sh
View File

@ -113,23 +113,14 @@ checkDependencies ()
dump_cmd='objdump -x '"$1"' | fgrep "DLL Name"' dump_cmd='objdump -x '"$1"' | fgrep "DLL Name"'
white_list="KERNEL32\.dll\|msvcrt\.dll\|USER32\.dll" white_list="KERNEL32\.dll\|msvcrt\.dll\|USER32\.dll"
elif [[ "$OS" == linux ]]; then elif [[ "$OS" == linux ]]; then
dump_cmd='ldd '"$1" dump_cmd='objdump -x '"$1"' | grep "NEEDED"'
white_list="libpthread\.so\.0\|libstdc++\.so\.6\|libc\.so\.6"
if [[ "$ARCH" == x86_32 ]]; then if [[ "$ARCH" == x86_32 ]]; then
white_list="linux-gate\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux\.so\.2" white_list="${white_list}\|libm\.so\.6"
elif [[ "$ARCH" == x86_64 ]]; then elif [[ "$ARCH" == x86_64 ]]; then
white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2" white_list="${white_list}\|libm\.so\.6"
elif [[ "$ARCH" == aarch_64 ]]; then elif [[ "$ARCH" == aarch_64 ]]; then
dump_cmd='aarch64-linux-gnu-objdump -x '"$1"' |grep "NEEDED"' white_list="${white_list}\|ld-linux-aarch64\.so\.1"
white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
elif [[ "$ARCH" == loongarch_64 ]]; then
dump_cmd='objdump -x '"$1"' | grep NEEDED'
white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld\.so\.1"
elif [[ "$ARCH" == ppcle_64 ]]; then
dump_cmd='powerpc64le-linux-gnu-objdump -x '"$1"' |grep "NEEDED"'
white_list="linux-vdso64\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld64\.so\.2"
elif [[ "$ARCH" == s390_64 ]]; then
dump_cmd='s390x-linux-gnu-objdump -x '"$1"' |grep "NEEDED"'
white_list="linux-vdso64\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld64\.so\.1"
fi fi
elif [[ "$OS" == osx ]]; then elif [[ "$OS" == osx ]]; then
dump_cmd='otool -L '"$1"' | fgrep dylib' dump_cmd='otool -L '"$1"' | fgrep dylib'