diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-12 10:04:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-12 13:44:10 -0700 |
| commit | 5acfacc2a125912c2172467fdaa0ef1f5ad6fb82 (patch) | |
| tree | f0462dbba5d74168734f64c3fe5605b9ba78e18d | |
| parent | Merge branch 'ja/doc-branch-markup' (diff) | |
| download | git-5acfacc2a125912c2172467fdaa0ef1f5ad6fb82.tar.gz git-5acfacc2a125912c2172467fdaa0ef1f5ad6fb82.zip | |
build: sed portability fixes
Recently generating the version-def.h file and the config-list.h
file have been updated, which broke versions of "sed" that do not
want to be fed a file that ends with an incomplete line, and/or that
do not understand the more recent "-E" option to use extended
regular expression.
Fix them in response to a build-failure reported on Solaris boxes.
cf. https://lore.kernel.org/git/09f954b8-d9c3-418f-ad4b-9cb9b063f4ae@comstyle.com/
Reported-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Collin Funk <collin.funk1@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rwxr-xr-x | generate-configlist.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b981598298..b32cf928b7 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -82,7 +82,7 @@ read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trail $(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ') EOF -REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \ +REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \ -e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \ -e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \ -e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \ diff --git a/generate-configlist.sh b/generate-configlist.sh index b06da53c89..f25cb9fc3e 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh @@ -13,17 +13,17 @@ print_config_list () { cat <<EOF static const char *config_name_list[] = { EOF - sed -E ' -/^`?[a-zA-Z].*\..*`?::$/ { + sed -e ' + /^`*[a-zA-Z].*\..*`*::$/ { /deprecated/d; s/::$//; s/`//g; s/^.*$/ "&",/; s/, */",\n "/g; p;}; -d' \ + d' \ "$SOURCE_DIR"/Documentation/*config.adoc \ - "$SOURCE_DIR"/Documentation/config/*.adoc| + "$SOURCE_DIR"/Documentation/config/*.adoc | sort cat <<EOF NULL, |