On Wed, Oct 15, 2025 at 6:15 PM Pietro Monteiro <[email protected]> wrote: > > 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.
Ok since this does not affect the build. > > Signed-off-by: Pietro Monteiro <[email protected]> > --- > 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 > -- > 2.43.0 >
