diff options
| author | NIIBE Yutaka <[email protected]> | 2023-07-28 02:29:30 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-07-28 02:29:30 +0000 |
| commit | e0286bf0a22861f8eadb70a077644a2925baff00 (patch) | |
| tree | ae680e1ecdc29973c5e34bfc206eec47815aafa3 | |
| parent | build: Support --verbose option for mkheader. (diff) | |
| download | libgpg-error-e0286bf0a22861f8eadb70a077644a2925baff00.tar.gz libgpg-error-e0286bf0a22861f8eadb70a077644a2925baff00.zip | |
build: Fix libtool modification.
* build-aux/ltmain.sh: Fix reverting mistake.
* build-aux/libtool.patch: Regenerate and fix whitespace mistake.
* configure.ac [x86_64-*mingw32*] (libtool-patch): Exit when failed.
--
Fixes-commit: c1d3f5952f621a553c122cee7a20e990d982a715
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | build-aux/libtool.patch | 22 | ||||
| -rw-r--r-- | build-aux/ltmain.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/build-aux/libtool.patch b/build-aux/libtool.patch index cc1340e..6dbaea6 100644 --- a/build-aux/libtool.patch +++ b/build-aux/libtool.patch @@ -19,8 +19,8 @@ elif test -n "$soname_spec"; then # bleh windows case $host in -+ x86_64-*mingw32*) -+ func_arith $current - $age ++ x86_64-*mingw32*) ++ func_arith $current - $age + major=$func_arith_result + versuffix="6-$major" + ;; @@ -31,15 +31,15 @@ # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result -- versuffix="-$major" -+ case $host in -+ x86_64-*mingw32*) -+ versuffix="6-$major" -+ ;; -+ *) -+ versuffix="-$major" -+ ;; -+ esac +- versuffix=-$major ++ case $host in ++ x86_64-*mingw32*) ++ versuffix="6-$major" ++ ;; ++ *) ++ versuffix="-$major" ++ ;; ++ esac ;; *) diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index f495350..9b12fbb 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -9275,7 +9275,7 @@ func_mode_link () # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) diff --git a/configure.ac b/configure.ac index 385ccf8..fa31cde 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,7 @@ LT_LANG([Windows Resource]) case $host in x86_64-*mingw32*) AC_CONFIG_COMMANDS([libtool-patch],[[ - patch -p0 < $srcdir/build-aux/libtool.patch + patch -p0 < $srcdir/build-aux/libtool.patch || as_fn_exit 1 ]]) ;; *) |