Skip to content

Commit f0eccac

Browse files
authored
Fix lld logic for Bookworm (#65)
1 parent 5030ec7 commit f0eccac

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile-debian.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex; \
3838
apt-mark auto '.*' > /dev/null; \
3939
apt-mark manual $savedAptMark; \
4040
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
41-
| awk '/=>/ { print $3 }' \
41+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4242
| sort -u \
43-
| xargs -r dpkg-query -S \
43+
| xargs -r dpkg-query --search \
4444
| cut -d: -f1 \
4545
| sort -u \
4646
| xargs -rt apt-mark manual; \

apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex; \
3838
apt-mark auto '.*' > /dev/null; \
3939
apt-mark manual $savedAptMark; \
4040
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
41-
| awk '/=>/ { print $3 }' \
41+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4242
| sort -u \
43-
| xargs -r dpkg-query -S \
43+
| xargs -r dpkg-query --search \
4444
| cut -d: -f1 \
4545
| sort -u \
4646
| xargs -rt apt-mark manual; \

fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN set -ex; \
3838
apt-mark auto '.*' > /dev/null; \
3939
apt-mark manual $savedAptMark; \
4040
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
41-
| awk '/=>/ { print $3 }' \
41+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4242
| sort -u \
43-
| xargs -r dpkg-query -S \
43+
| xargs -r dpkg-query --search \
4444
| cut -d: -f1 \
4545
| sort -u \
4646
| xargs -rt apt-mark manual; \

0 commit comments

Comments
 (0)