Commit d61088c
0
plików
+0
dodanych
-0
usuniętych
@@ -25,17 +25,7 @@ sha256sums:
25
25
build: |
26
26
cd ${pkgname}-${pkgver}
27
27
28
- # Bez pkg-config: .pc Abseil w rootfsie są niespójne wersyjnie (20260526 vs 20260817)
29
- ABSL_LIBS=""
30
- for f in /usr/lib/libabsl_*.so; do
31
- n="$(basename "$f" .so)"
32
- case "$n" in
33
- *test*|*mock*|*gtest*|*benchmark*) continue ;;
34
- esac
35
- ABSL_LIBS="${ABSL_LIBS} -l${n#lib}"
36
- done
37
- [ -n "${ABSL_LIBS}" ] || { echo "Brak /usr/lib/libabsl_*.so"; exit 1; }
38
-
28
+ # Usuń ręczne ABSL_LIBS i zaufaj pkg-config
39
29
cmake -S . -B build -G Ninja \
40
30
-D CMAKE_INSTALL_PREFIX=/usr \
41
31
-D CMAKE_INSTALL_LIBDIR=lib \
@@ -46,11 +36,8 @@ build: |
46
36
-D protobuf_BUILD_TESTS=OFF \
47
37
-D protobuf_INSTALL=ON \
48
38
-D protobuf_WITH_ZLIB=ON \
49
- -D protobuf_ABSL_PROVIDER=package \
50
- -D CMAKE_SHARED_LINKER_FLAGS="-Wl,--no-as-needed ${ABSL_LIBS}" \
51
- -D CMAKE_EXE_LINKER_FLAGS="-Wl,--no-as-needed ${ABSL_LIBS}" \
39
+ -D protobuf_ABSL_PROVIDER=package \ # <-- Kluczowa opcja: używa systemowego Abseil
52
40
-Wno-dev
53
-
54
41
cmake --build build
55
42
56
43
package: |