diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-10-24 03:04:29 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-10-24 03:04:29 +0000 |
| commit | cbd2260b272f41b0939ed53466bc39b6dc384910 (patch) | |
| tree | 47f41aa87104524381a8f2919e230a11054c046c /backport-Remove-libtool-la-symlinks.patch | |
| parent | 4ad1d692311b38472d44f5deb9c32634b334ed4d (diff) | |
automatic import of rpmopeneuler24.03_LTS
Diffstat (limited to 'backport-Remove-libtool-la-symlinks.patch')
| -rw-r--r-- | backport-Remove-libtool-la-symlinks.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/backport-Remove-libtool-la-symlinks.patch b/backport-Remove-libtool-la-symlinks.patch new file mode 100644 index 0000000..288d1c4 --- /dev/null +++ b/backport-Remove-libtool-la-symlinks.patch @@ -0,0 +1,33 @@ +From 4936c42b4d8ed68af45fe220d24b2a69baaf9676 Mon Sep 17 00:00:00 2001 +From: Florian Festi <ffesti@redhat.com> +Date: Tue, 17 Sep 2024 13:13:13 +0200 +Subject: [PATCH] brp-remove-la-files: Remove symlinks, too + +As we check for file contents delete symlink before looking at regular +files. + +Resolves: #3304 +--- + scripts/brp-remove-la-files | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/scripts/brp-remove-la-files b/scripts/brp-remove-la-files +index 58c513bf88..0e6e58f31a 100755 +--- a/scripts/brp-remove-la-files ++++ b/scripts/brp-remove-la-files +@@ -5,6 +5,12 @@ if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then + exit 0 + fi + +-find "$RPM_BUILD_ROOT" -type f -name '*.la' 2>/dev/null -print0 | +- xargs -0 grep --fixed-strings '.la - a libtool library file' --files-with-matches --null | +- xargs -0 rm --force ++# Check and remove symlinks first then regular files ++for FILETYPE in l f ++do ++ ++ find "$RPM_BUILD_ROOT" -type $FILETYPE -name '*.la' 2>/dev/null -print0 | ++ xargs -0 grep --fixed-strings '.la - a libtool library file' --files-with-matches --null | ++ xargs -0 rm --force ++ ++done |