From 73650105ba44665fe9cdb9f001953bb32e99fec0 Mon Sep 17 00:00:00 2001 From: Pietro Monteiro Date: Wed, 28 Jan 2026 20:16:04 -0500 Subject: [PATCH] libffi: Remove more unneeded files when merging Delete .allow-ai-service and .gail-labels which are present in newer versions of libffi. libffi/ChangeLog: PR libffi/117635 * merge.sh: Delete .allow-ai-service and .gail-labels when merging new upstream versions. Signed-off-by: Pietro Monteiro --- libffi/merge.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libffi/merge.sh b/libffi/merge.sh index b36fbb92185..d9db9b01a78 100755 --- a/libffi/merge.sh +++ b/libffi/merge.sh @@ -33,9 +33,11 @@ echo Current upstream revision: $CUR_REV # Remove the unused files. pushd upstream -rm -rf ChangeLog.old .appveyor* .ci .github .gitignore .travis* \ - config.guess config.sub libtool-ldflags m4 make_sunver.pl \ - msvc_build + +rm -rf ChangeLog.old .allow-ai-service .gail-labels .appveyor* .ci .github \ + .gitignore .travis* config.guess config.sub libtool-ldflags m4 \ + make_sunver.pl msvc_build + rm -rf .git autogen.sh cp -a . .. popd