From ca514a1d542a433570c2646b038edfbd0aac1766 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Wed, 24 Nov 2021 16:20:44 +0100
Subject: [PATCH] Modify the naming scheme for libtool patches.
1. Patches that modify ltmain.sh only start with 1xx prefix.
2. Patches that modify any of m4 files start with 0xx prefix.
---
autogen.sh | 16 ++++++++--------
.../README.txt | 0
.../nagfor-libtool-2.4.6.patch | 0
.../README | 0
.../aix-deplib-libtool.patch | 0
.../README | 0
.../ltmain-ld-groups-libtool-2.4.6.patch | 0
.../README | 0
.../ltmain-xlinker-patch.patch | 0
.../macos-nagfor.patch | 0
.../ltmain_nag_pthread.patch | 0
.../README | 0
.../ltmain-early-xcompile-libtool-2.4.6.patch | 0
.../ltmain-parallel-printf.patch | 0
14 files changed, 8 insertions(+), 8 deletions(-)
rename contrib/{00nagfor-libtool-patch => 100nagfor-libtool-patch}/README.txt (100%)
rename contrib/{00nagfor-libtool-patch => 100nagfor-libtool-patch}/nagfor-libtool-2.4.6.patch (100%)
rename contrib/{01aix-deplib-rpath-patch => 101aix-deplib-rpath-patch}/README (100%)
rename contrib/{01aix-deplib-rpath-patch => 101aix-deplib-rpath-patch}/aix-deplib-libtool.patch (100%)
rename contrib/{03ltmain-ld-groups-patch => 103ltmain-ld-groups-patch}/README (100%)
rename contrib/{03ltmain-ld-groups-patch => 103ltmain-ld-groups-patch}/ltmain-ld-groups-libtool-2.4.6.patch (100%)
rename contrib/{04ltmain-xlinker-patch => 104ltmain-xlinker-patch}/README (100%)
rename contrib/{04ltmain-xlinker-patch => 104ltmain-xlinker-patch}/ltmain-xlinker-patch.patch (100%)
rename contrib/{05macos-nagfor-patch => 105macos-nagfor-patch}/macos-nagfor.patch (100%)
rename contrib/{06ltmain_nag_pthread-patch => 106ltmain_nag_pthread-patch}/ltmain_nag_pthread.patch (100%)
rename contrib/{07ltmain-early-xcompile-patch => 107ltmain-early-xcompile-patch}/README (100%)
rename contrib/{07ltmain-early-xcompile-patch => 107ltmain-early-xcompile-patch}/ltmain-early-xcompile-libtool-2.4.6.patch (100%)
rename contrib/{08ltmain-parallel-printf-patch => 108ltmain-parallel-printf-patch}/ltmain-parallel-printf.patch (100%)
diff --git a/autogen.sh b/autogen.sh
index 8df57a7a6..4972cb24f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,14 +50,14 @@ autoreconf -fvi || exit $?
# Patch the rest of the files:
for patch in \
- contrib/00nagfor-libtool-patch/nagfor-libtool-2.4.6.patch \
- contrib/01aix-deplib-rpath-patch/aix-deplib-libtool.patch \
- contrib/03ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch \
- contrib/04ltmain-xlinker-patch/ltmain-xlinker-patch.patch \
- contrib/05macos-nagfor-patch/macos-nagfor.patch \
- contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch \
- contrib/07ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch \
- contrib/08ltmain-parallel-printf-patch/ltmain-parallel-printf.patch \
+ contrib/100nagfor-libtool-patch/nagfor-libtool-2.4.6.patch \
+ contrib/101aix-deplib-rpath-patch/aix-deplib-libtool.patch \
+ contrib/103ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch \
+ contrib/104ltmain-xlinker-patch/ltmain-xlinker-patch.patch \
+ contrib/105macos-nagfor-patch/macos-nagfor.patch \
+ contrib/106ltmain_nag_pthread-patch/ltmain_nag_pthread.patch \
+ contrib/107ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch \
+ contrib/108ltmain-parallel-printf-patch/ltmain-parallel-printf.patch \
; do
echo "applying $patch"
patch -p 1 --no-backup-if-mismatch --forward -r - -i $patch -d .
diff --git a/contrib/00nagfor-libtool-patch/README.txt b/contrib/100nagfor-libtool-patch/README.txt
similarity index 100%
rename from contrib/00nagfor-libtool-patch/README.txt
rename to contrib/100nagfor-libtool-patch/README.txt
diff --git a/contrib/00nagfor-libtool-patch/nagfor-libtool-2.4.6.patch b/contrib/100nagfor-libtool-patch/nagfor-libtool-2.4.6.patch
similarity index 100%
rename from contrib/00nagfor-libtool-patch/nagfor-libtool-2.4.6.patch
rename to contrib/100nagfor-libtool-patch/nagfor-libtool-2.4.6.patch
diff --git a/contrib/01aix-deplib-rpath-patch/README b/contrib/101aix-deplib-rpath-patch/README
similarity index 100%
rename from contrib/01aix-deplib-rpath-patch/README
rename to contrib/101aix-deplib-rpath-patch/README
diff --git a/contrib/01aix-deplib-rpath-patch/aix-deplib-libtool.patch b/contrib/101aix-deplib-rpath-patch/aix-deplib-libtool.patch
similarity index 100%
rename from contrib/01aix-deplib-rpath-patch/aix-deplib-libtool.patch
rename to contrib/101aix-deplib-rpath-patch/aix-deplib-libtool.patch
diff --git a/contrib/03ltmain-ld-groups-patch/README b/contrib/103ltmain-ld-groups-patch/README
similarity index 100%
rename from contrib/03ltmain-ld-groups-patch/README
rename to contrib/103ltmain-ld-groups-patch/README
diff --git a/contrib/03ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch b/contrib/103ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch
similarity index 100%
rename from contrib/03ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch
rename to contrib/103ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch
diff --git a/contrib/04ltmain-xlinker-patch/README b/contrib/104ltmain-xlinker-patch/README
similarity index 100%
rename from contrib/04ltmain-xlinker-patch/README
rename to contrib/104ltmain-xlinker-patch/README
diff --git a/contrib/04ltmain-xlinker-patch/ltmain-xlinker-patch.patch b/contrib/104ltmain-xlinker-patch/ltmain-xlinker-patch.patch
similarity index 100%
rename from contrib/04ltmain-xlinker-patch/ltmain-xlinker-patch.patch
rename to contrib/104ltmain-xlinker-patch/ltmain-xlinker-patch.patch
diff --git a/contrib/05macos-nagfor-patch/macos-nagfor.patch b/contrib/105macos-nagfor-patch/macos-nagfor.patch
similarity index 100%
rename from contrib/05macos-nagfor-patch/macos-nagfor.patch
rename to contrib/105macos-nagfor-patch/macos-nagfor.patch
diff --git a/contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch b/contrib/106ltmain_nag_pthread-patch/ltmain_nag_pthread.patch
similarity index 100%
rename from contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch
rename to contrib/106ltmain_nag_pthread-patch/ltmain_nag_pthread.patch
diff --git a/contrib/07ltmain-early-xcompile-patch/README b/contrib/107ltmain-early-xcompile-patch/README
similarity index 100%
rename from contrib/07ltmain-early-xcompile-patch/README
rename to contrib/107ltmain-early-xcompile-patch/README
diff --git a/contrib/07ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch b/contrib/107ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch
similarity index 100%
rename from contrib/07ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch
rename to contrib/107ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch
diff --git a/contrib/08ltmain-parallel-printf-patch/ltmain-parallel-printf.patch b/contrib/108ltmain-parallel-printf-patch/ltmain-parallel-printf.patch
similarity index 100%
rename from contrib/08ltmain-parallel-printf-patch/ltmain-parallel-printf.patch
rename to contrib/108ltmain-parallel-printf-patch/ltmain-parallel-printf.patch
--
GitLab