[packages/erlang] - updated autotools rebuild for no-fop patch to actually work - added ac patch to allow autoconf > 2
qboosh
qboosh at pld-linux.org
Tue Oct 26 06:20:17 CEST 2021
commit 4cae44a69c2bc8201358e74bab70eadbcc33868b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Oct 26 06:25:33 2021 +0200
- updated autotools rebuild for no-fop patch to actually work
- added ac patch to allow autoconf > 2.69
- package erts lib files
erlang-ac.patch | 23 +++++++++++++++++++++++
erlang.spec | 12 ++++++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 073700e..afe70e2 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -34,9 +34,10 @@ Patch1: x32.patch
# disable pdf docs (require libxslt-progs and fop > 1.0, with -cache option)
Patch2: %{name}-no-fop.patch
Patch3: ssl.patch
+Patch4: %{name}-ac.patch
URL: http://www.erlang.org/
%{?with_java:BuildRequires: /usr/bin/jar}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.69
BuildRequires: automake
BuildRequires: flex
%{?with_java:BuildRequires: jdk >= 1.2}
@@ -87,9 +88,10 @@ Dokumentacja do Erlanga.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
-./otp_build autoconf
+./otp_build update_configure --no-commit
%configure \
%ifarch sparc
@@ -200,9 +202,15 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/bin/typer
%{_libdir}/%{name}/bin/start*.*
%dir %{_libdir}/%{name}/erts-%{erts_version}
+%{_libdir}/%{name}/erts-%{erts_version}/info
%{_libdir}/%{name}/erts-%{erts_version}/man
%{_libdir}/%{name}/erts-%{erts_version}/src
%{_libdir}/%{name}/erts-%{erts_version}/include
+%dir %{_libdir}/%{name}/erts-%{erts_version}/lib
+%{_libdir}/%{name}/erts-%{erts_version}/lib/liberts*.a
+%dir %{_libdir}/%{name}/erts-%{erts_version}/lib/internal
+%{_libdir}/%{name}/erts-%{erts_version}/lib/internal/liberts_internal*.a
+%{_libdir}/%{name}/erts-%{erts_version}/lib/internal/libethread.a
#%{_libdir}/%{name}/erts-%{erts_version}/*.ear
%dir %{_libdir}/%{name}/erts-%{erts_version}/bin
%attr(755,root,root) %{_libdir}/%{name}/erts-%{erts_version}/bin/beam*
diff --git a/erlang-ac.patch b/erlang-ac.patch
new file mode 100644
index 0000000..b2e8138
--- /dev/null
+++ b/erlang-ac.patch
@@ -0,0 +1,23 @@
+--- otp-OTP-24.1.2/otp_build.orig 2021-10-04 17:12:13.000000000 +0200
++++ otp-OTP-24.1.2/otp_build 2021-10-25 21:32:32.099541733 +0200
+@@ -197,20 +197,6 @@ do_update_configure ()
+ {
+ get_do_commit $1
+
+- ac_ver_blob=`autoconf --version`
+- if [ $? -ne 0 ]; then
+- echo "ERROR: Failed to check autoconf version! You need to have autoconf of version $USE_AUTOCONF_VERSION in path." 1>&2
+- exit 1
+- fi
+- ac_ver=`echo $ac_ver_blob | sed "s|[^0-9]*\([0-9][^ \t\n]*\).*|\1|"`
+- case $ac_ver in
+- $USE_AUTOCONF_VERSION)
+- ;;
+- *)
+- echo "ERROR: autoconf of version $ac_ver found in path! You need to have autoconf of version $USE_AUTOCONF_VERSION in path." 1>&2
+- exit 1;;
+- esac
+-
+ out_files=
+
+ for dir in $aclocal_dirs; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/erlang.git/commitdiff/4cae44a69c2bc8201358e74bab70eadbcc33868b
More information about the pld-cvs-commit
mailing list