diff --git a/erlang.spec b/erlang.spec index 1b08d44..13ae569 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,10 +16,6 @@ %endif %endif -%ifarch %{arm} %{ix86} x86_64 ppc %{power64} -%global __with_hipe 1 -%endif - ## ## Optional components ## @@ -64,8 +60,8 @@ Name: erlang -Version: 23.3.1 -Release: 1%{?dist} +Version: 24.0 +Release: 0.1.rc2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -73,7 +69,7 @@ URL: https://www.erlang.org %if ! (0%{?rhel} && 0%{?rhel} <= 6) VCS: scm:git:https://github.com/erlang/otp %endif -Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc2/otp-OTP-%{version}-rc2.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -153,7 +149,6 @@ Requires: %{name}-et%{?_isa} = %{version}-%{release} %endif # __with_wxwidgets Requires: %{name}-eunit%{?_isa} = %{version}-%{release} Requires: %{name}-ftp%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} @@ -232,7 +227,6 @@ A portable framework for automatic testing. Summary: A byte code compiler for Erlang which produces highly compact code Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -267,7 +261,6 @@ A debugger for debugging and testing of Erlang programs. Summary: A DIscrepancy AnaLYZer for ERlang programs Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} @@ -364,6 +357,7 @@ Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs +Obsoletes: erlang-hipe Obsoletes: erlang-inviso Obsoletes: erlang-ose Obsoletes: erlang-otp_mibs @@ -422,17 +416,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description ftp FTP client. -%package hipe -Summary: High Performance Erlang -Requires: %{name}-compiler%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} - -%description hipe -High Performance Erlang. - %package inets Summary: A set of services such as a Web server and a HTTP client etc Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -702,7 +685,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version} +%autosetup -p1 -n otp-OTP-%{version}-rc2 # FIXME we should come up with a better solution # remove shipped zlib sources @@ -727,7 +710,6 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \ - %{?__with_hipe:--enable-hipe} \ %{?__without_kernel_poll:--disable-kernel-poll} \ %if %{__with_java} \ @@ -1046,10 +1028,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files edoc %{_libdir}/erlang/lib/edoc-*/ %if %{with doc} +%{_mandir}/man1/edoc.* %{_mandir}/man3/edoc.* %{_mandir}/man3/edoc_doclet.* +%{_mandir}/man3/edoc_doclet_chunks.* %{_mandir}/man3/edoc_extract.* %{_mandir}/man3/edoc_layout.* +%{_mandir}/man3/edoc_layout_chunks.* %{_mandir}/man3/edoc_lib.* %{_mandir}/man3/edoc_run.* %endif @@ -1082,7 +1067,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ #%%{_mandir}/man3/erl_global.* #%%{_mandir}/man3/erl_malloc.* #%%{_mandir}/man3/erl_marshal.* -%{_mandir}/man3/registry.* %endif %files erts @@ -1235,9 +1219,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ftp.* %endif -%files hipe -%{_libdir}/erlang/lib/hipe-*/ - %files inets %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin @@ -1307,7 +1288,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/net_kernel.* %{_mandir}/man3/os.* %{_mandir}/man3/pg.* -%{_mandir}/man3/pg2.* %{_mandir}/man3/rpc.* %{_mandir}/man3/seq_trace.* %{_mandir}/man3/user.* @@ -1549,6 +1529,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/digraph_utils.* %{_mandir}/man3/epp.* %{_mandir}/man3/erl_anno.* +%{_mandir}/man3/erl_error.* %{_mandir}/man3/erl_eval.* %{_mandir}/man3/erl_expand_records.* %{_mandir}/man3/erl_id_trans.* @@ -1613,8 +1594,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erl_recomment.* %{_mandir}/man3/erl_syntax.* %{_mandir}/man3/erl_syntax_lib.* -%{_mandir}/man3/erl_tidy.* -%{_mandir}/man3/igor.* %{_mandir}/man3/merl.* %{_mandir}/man3/merl_transform.* %{_mandir}/man3/prettypr.* @@ -1681,6 +1660,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxBitmap.* %{_mandir}/man3/wxBitmapButton.* %{_mandir}/man3/wxBitmapDataObject.* +%{_mandir}/man3/wxBookCtrlBase.* +%{_mandir}/man3/wxBookCtrlEvent.* %{_mandir}/man3/wxBoxSizer.* %{_mandir}/man3/wxBrush.* %{_mandir}/man3/wxBufferedDC.* @@ -1740,11 +1721,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxGBSizerItem.* %{_mandir}/man3/wxGCDC.* %{_mandir}/man3/wxGLCanvas.* +%{_mandir}/man3/wxGLContext.* %{_mandir}/man3/wxGauge.* %{_mandir}/man3/wxGenericDirCtrl.* %{_mandir}/man3/wxGraphicsBrush.* %{_mandir}/man3/wxGraphicsContext.* %{_mandir}/man3/wxGraphicsFont.* +%{_mandir}/man3/wxGraphicsGradientStops.* %{_mandir}/man3/wxGraphicsMatrix.* %{_mandir}/man3/wxGraphicsObject.* %{_mandir}/man3/wxGraphicsPath.* @@ -1809,7 +1792,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxMultiChoiceDialog.* %{_mandir}/man3/wxNavigationKeyEvent.* %{_mandir}/man3/wxNotebook.* -%{_mandir}/man3/wxNotebookEvent.* +%{_mandir}/man3/wxNotificationMessage.* %{_mandir}/man3/wxNotifyEvent.* %{_mandir}/man3/wxOverlay.* %{_mandir}/man3/wxPageSetupDialog.* @@ -1888,6 +1871,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxTreeEvent.* %{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxUpdateUIEvent.* +%{_mandir}/man3/wxWebView.* +%{_mandir}/man3/wxWebViewEvent.* %{_mandir}/man3/wxWindow.* %{_mandir}/man3/wxWindowCreateEvent.* %{_mandir}/man3/wxWindowDC.* @@ -1912,6 +1897,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Apr 3 2021 Peter Lemenkov - 24.0-0.1.rc2 +- Ver. 24.0-rc2 +- Removed hipe + * Tue Mar 30 2021 Peter Lemenkov - 23.3.1-1 - Ver. 23.3.1 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 3fd02f3..7034252 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 7a2b821c46..f5f3ee69cb 100644 +index ba4d898f79..a22e557007 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -528,10 +528,6 @@ endif +@@ -525,10 +525,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index f44a974..be5841a 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 0821bd8d00..c94f01420e 100644 +index f962b7b9ad..916d23d69c 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -126,7 +126,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -125,7 +125,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) @@ -17,16 +17,3 @@ index 0821bd8d00..c94f01420e 100644 CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else -diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile -index ff9d3e1dc9..d3aba77808 100644 ---- a/lib/crypto/priv/Makefile -+++ b/lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 0745b8a..12f4eb8 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -26,32 +26,11 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: -diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c94f01420e..e2cae1692f 100644 ---- a/lib/crypto/c_src/Makefile.in -+++ b/lib/crypto/c_src/Makefile.in -@@ -237,16 +237,11 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" - $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" -- $(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj" -- $(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj" - $(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib" - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) -- $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj" - $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib" - endif -- $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" - $(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib" - - release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 7ff3f09abb..2b94ce7de0 100644 +index 061fd05a1d..498b7d1370 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -748,14 +748,13 @@ release: opt +@@ -691,13 +691,12 @@ release: opt $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -60,7 +39,6 @@ index 7ff3f09abb..2b94ce7de0 100644 - $(INSTALL_DATA) encode/*.[ch] "$(RELSYSDIR)/src/encode" - $(INSTALL_DATA) epmd/*.[ch] "$(RELSYSDIR)/src/epmd" - $(INSTALL_DATA) misc/*.[ch] "$(RELSYSDIR)/src/misc" -- $(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry" - $(INSTALL_DATA) global/*.[ch] "$(RELSYSDIR)/src/global" - $(INSTALL_DATA) prog/*.[ch] "$(RELSYSDIR)/src/prog" + $(INSTALL_DATA) connect/*.h "$(RELSYSDIR)/src/connect" @@ -68,7 +46,6 @@ index 7ff3f09abb..2b94ce7de0 100644 + $(INSTALL_DATA) encode/*.h "$(RELSYSDIR)/src/encode" + $(INSTALL_DATA) epmd/*.h "$(RELSYSDIR)/src/epmd" + $(INSTALL_DATA) misc/*.h "$(RELSYSDIR)/src/misc" -+ $(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry" + $(INSTALL_DATA) prog/*.h "$(RELSYSDIR)/src/prog" release_docs: @@ -116,10 +93,10 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 8e13571786..ae18ef3cf4 100644 +index 878aa2cde6..0153885e88 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -188,8 +188,6 @@ include ../vsn.mk +@@ -170,8 +170,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 1bc3055..989f09d 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -21,10 +21,10 @@ index b0c205cec8..7fad1ddc75 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index a6ff72898c..35d4530f32 100644 +index 60a2020dbf..406cc08208 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -155,7 +155,7 @@ release_spec: opt +@@ -151,7 +151,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,10 +63,10 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index b1531ac985..dbcfe0042c 100644 +index f195e16dc6..68c6695b9e 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -184,8 +184,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -104,10 +104,10 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 1f5b308c7d..1f728c56d6 100644 +index 0847da9d5a..24a054ac04 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -135,7 +135,7 @@ index 36e8fefd4c..d3a10890ce 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index ea2f45dc4c..84af08eb67 100644 +index 8acef15248..ead1fd3b0f 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -87,7 +87,7 @@ release_spec: opt @@ -204,118 +204,6 @@ index 32f75202a0..a89fa7f2d2 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index affbb10ff6..44598beff2 100644 ---- a/lib/hipe/cerl/Makefile -+++ b/lib/hipe/cerl/Makefile -@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/cerl" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index d883eecf36..3119bc4638 100644 ---- a/lib/hipe/flow/Makefile -+++ b/lib/hipe/flow/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/flow" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" -+ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index b220bc16a0..d4073277be 100644 ---- a/lib/hipe/icode/Makefile -+++ b/lib/hipe/icode/Makefile -@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/icode" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 5e8f2076db..06d3f2684d 100644 ---- a/lib/hipe/llvm/Makefile -+++ b/lib/hipe/llvm/Makefile -@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/llvm -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - -diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index 8ef31dbb46..80d28819f2 100644 ---- a/lib/hipe/main/Makefile -+++ b/lib/hipe/main/Makefile -@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" - $(INSTALL_DIR) "$(RELSYSDIR)/main" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index e5033e444b..74a444b386 100644 ---- a/lib/hipe/misc/Makefile -+++ b/lib/hipe/misc/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/misc" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 67485875a6..f83a2bb9e2 100644 ---- a/lib/hipe/rtl/Makefile -+++ b/lib/hipe/rtl/Makefile -@@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/rtl" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 20b1c3bf50..40c642a441 100644 ---- a/lib/hipe/util/Makefile -+++ b/lib/hipe/util/Makefile -@@ -50,7 +50,6 @@ HIPE_MODULES = - endif - MODULES = hipe_timing hipe_dot hipe_digraph hipe_dsets $(HIPE_MODULES) - --HRL_FILES= - ERL_FILES= $(MODULES:%=%.erl) - TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) - DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/util" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile index a1c1f36b70..f2eb86f7ac 100644 --- a/lib/inets/src/http_client/Makefile @@ -356,10 +244,10 @@ index da9549406f..eaa14b628f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index ec1ae70305..88c084ef58 100644 +index edaec7655b..6969b5b5ab 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -369,10 +257,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 6c75bcffee..d15bdb867a 100644 +index 1bf8459602..bc65afca02 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -236,7 +236,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -394,10 +282,10 @@ index ab45548099..5c7a7f0be9 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 7fc90fd6d5..6ad086ed01 100644 +index 9e33fe3ae5..1db69567bb 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile -@@ -177,7 +177,7 @@ release_spec: opt +@@ -154,7 +154,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" @@ -445,10 +333,10 @@ index d07db3fa4b..7f421d24cc 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index 3dd24b1df7..836e163499 100644 +index bb5f80403b..a78a4551a8 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile -@@ -131,7 +131,7 @@ release_spec: opt +@@ -133,7 +133,7 @@ release_spec: opt $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/text" @@ -600,10 +488,10 @@ index 16a42caf11..674364281d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 1bde1ca972..acc42385f3 100644 +index 1b7999da20..661b5a5e3f 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile -@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" @@ -613,10 +501,10 @@ index 1bde1ca972..acc42385f3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 6f2b8a4077..bd062a6473 100644 +index 09ffc7d36a..090df59403 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile -@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/app" @@ -626,10 +514,10 @@ index 6f2b8a4077..bd062a6473 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index d9678669a5..ff9dff95d9 100644 +index a8da839bfc..c9e9e1892d 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -639,10 +527,10 @@ index d9678669a5..ff9dff95d9 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 57ff08c160..d51f627ca5 100644 +index ab8c36ec5e..839dc03917 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" @@ -652,10 +540,10 @@ index 57ff08c160..d51f627ca5 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index adc2c4858f..89ce954e99 100644 +index 51318b5c66..d4015d71f4 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile -@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" @@ -665,10 +553,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index ab6137e518..bdeabca8c3 100644 +index 4f4b55f5c5..ee966e3eed 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -691,10 +579,10 @@ index 5edd6cb4b9..39008882ca 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index e3e0c9c03d..ff9bad32ab 100644 +index 509648cb2b..0ffc2c6ed1 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -221,7 +221,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -703,10 +591,10 @@ index e3e0c9c03d..ff9bad32ab 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index c21d2f49c8..03dbc74ef7 100644 +index af6a472f3d..6796810ac2 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile -@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -742,10 +630,10 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 52f4008e0a..dc297f1d55 100644 +index 3780e0eea3..05c8416de7 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) +@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index ed9e2ac..2b7e1e2 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 4c4823eb38..de0ab149fb 100644 +index 3ab50cafe0..f510535714 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0008-Avoid-forking-sed-to-get-basename.patch b/otp-0008-Avoid-forking-sed-to-get-basename.patch index f98699a..a0ceb3e 100644 --- a/otp-0008-Avoid-forking-sed-to-get-basename.patch +++ b/otp-0008-Avoid-forking-sed-to-get-basename.patch @@ -4,11 +4,11 @@ Subject: [PATCH] Avoid forking sed to get basename. diff --git a/erts/etc/unix/erl.src.src b/erts/etc/unix/erl.src.src -index 959c099e8f..861b8bcbf1 100644 +index 0983132ac1..6b55e8f0f3 100644 --- a/erts/etc/unix/erl.src.src +++ b/erts/etc/unix/erl.src.src -@@ -21,7 +21,7 @@ - ROOTDIR="%FINAL_ROOTDIR%" +@@ -26,7 +26,7 @@ else + fi BINDIR=$ROOTDIR/erts-%VSN%/bin EMU=%EMULATOR%%EMULATOR_NUMBER% -PROGNAME=`echo $0 | sed 's/.*\///'` diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index d68a78b..5ee1c9b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 9dba684cbb..b4c5a8413f 100644 +index 0efacd67a1..777079301c 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -727,8 +727,10 @@ int main(int argc, char **argv) +@@ -720,8 +720,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index dd69d34..90abd98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.3.1.tar.gz) = 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0 +SHA512 (otp-OTP-24.0-rc2.tar.gz) = 10a658388f6cf2abd70cadbc4e6e0d6547afaa4ba9afdb85431fd7d2e50ded19000472533f54f690e7b0adc747382cfa5af7533fbb9e1ee58c992c03b37d1144