File 0168-Remove-superflouos-invokations-of-.-otp_bu... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0168-Remove-superflouos-invokations-of-.-otp_build-autoco.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Currently displaying revision f11a8876faa0a8240b9c8df85bc35eb2 , Show latest

From 132b0f4a59c57bd2b2df1b8e9db59f8ed5c067e0 Mon Sep 17 00:00:00 2001
From: Marcel Lanz <marcellanz@n-1.ch>
Date: Sat, 23 Oct 2021 20:25:54 +0200
Subject: [PATCH 1/2] Remove superflouos invokations of ./otp_build autoconf

---
 .github/scripts/init-pre-release.sh | 26 +++-----------------------
 HOWTO/OTP-PATCH-APPLY.md            |  5 -----
 lib/megaco/Makefile                 |  1 -
 scripts/build-otp-tar               | 10 ----------
 4 files changed, 3 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
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 3f11026564..362d69d508 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
-- 
2.31.1

Places

File 0168-Remove-superflouos-invokations-of-.-otp_build-autoco.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Places