diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2021-11-18 13:21:47 +0100 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2021-11-18 13:21:47 +0100 |
| commit | 341f8e2fc9412e5641528c0516a5f4c5e82f350c (patch) | |
| tree | 58e12d3382060de2611dd82753e1ce571296a49e | |
| parent | ec1584f9235f2ec54ced91f56c0e980708ff1ed7 (diff) | |
| parent | 39f278cd3d0fdf37d4a12be48a55b020ea78fa16 (diff) | |
| download | erlang-341f8e2fc9412e5641528c0516a5f4c5e82f350c.tar.gz | |
Merge branch 'maint'
| -rwxr-xr-x | .github/scripts/init-pre-release.sh | 26 | ||||
| -rw-r--r-- | HOWTO/OTP-PATCH-APPLY.md | 5 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | lib/megaco/Makefile | 1 | ||||
| -rwxr-xr-x | scripts/build-otp-tar | 10 |
5 files changed, 13 insertions, 39 deletions
diff --git a/.github/scripts/init-pre-release.sh b/.github/scripts/init-pre-release.sh index 7bc0550b53..7a86f3052c 100755 --- a/.github/scripts/init-pre-release.sh +++ b/.github/scripts/init-pre-release.sh @@ -1,26 +1,6 @@ #!/bin/sh -## We create a tar ball that has generated configure -## (old versions might not have these included) -## This is used later by build-otp-tar to create -## the pre-built tar ball +## We create a tar ball that is used later by build-otp-tar +## to create the pre-built tar ball -if [ -f ./configure ]; then - git archive --prefix otp/ -o otp_src.tar.gz HEAD -else - ERL_TOP=`pwd` - ./otp_build autoconf - find . -name aclocal.m4 | xargs git add -f - find . -name configure | xargs git add -f - find . -name config.h.in | xargs git add -f - find . -name config.guess | xargs git add -f - find . -name config.sub | xargs git add -f - find . -name install-sh | xargs git add -f - if ! git config user.name; then - git config user.email "you@example.com" - git config user.name "Your Name" - fi - git commit --no-verify -m 'Add generated configure files' - git archive --prefix otp/ -o otp_src.tar.gz HEAD - git reset --hard HEAD~1 -fi +git archive --prefix otp/ -o otp_src.tar.gz HEAD diff --git a/HOWTO/OTP-PATCH-APPLY.md b/HOWTO/OTP-PATCH-APPLY.md index 1fdd13f9c4..2340784992 100644 --- a/HOWTO/OTP-PATCH-APPLY.md +++ b/HOWTO/OTP-PATCH-APPLY.md @@ -49,11 +49,6 @@ the updated applications. > *NOTE*: Before applying a patch you need to do a *full* build > of OTP in the source directory. -If you are building in `git` you first need to generate the -`configure` scripts: - - $ ./otp_build autoconf - Configure and build all applications in OTP: $ configure @@ -41,7 +41,17 @@ To compile Erlang from source, run the following commands. The complete building ``` git clone https://github.com/erlang/otp.git cd otp +``` +Checkout the branch or tag of your choice +``` +git checkout maint-24 # current latest stable version +``` +For older versions run autoconf +``` ./otp_build autoconf +``` +Configure, build and install +``` ./configure make make install diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile index 624c4b0619..f66f75876b 100644 --- a/lib/megaco/Makefile +++ b/lib/megaco/Makefile @@ -115,7 +115,6 @@ include $(ERL_TOP)/make/otp_subdir.mk reconf: (cd $(ERL_TOP) && \ - ./otp_build autoconf && \ ./otp_build configure && \ cd $(ERL_TOP)/../libraries/megaco) diff --git a/scripts/build-otp-tar b/scripts/build-otp-tar index aef05d6845..cc5310f468 100755 --- a/scripts/build-otp-tar +++ b/scripts/build-otp-tar @@ -469,16 +469,6 @@ else echo " === Environment ==================================== " >> $build_log env >> $build_log - progress "Running autoconf in OTP" - echo " " >> $build_log - echo " === Running autoconf in OTP ================================ " >> $build_log - echo " " >> $build_log - echo "./otp_build autoconf" >> $build_log - ./otp_build autoconf >> $build_log 2>&1 - if [ $? -ne 0 ]; then - error "Failed to run autoconf in OTP" - fi - progress "Configuring OTP" echo " " >> $build_log echo " === Configuring OTP ================================ " >> $build_log |