~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
3 2

[alpine-aports] [PATCH] main/erlang: Update to 18.1

Details
Message ID
<1443487903-19624-1-git-send-email-marlus.saraiva@gmail.com>
Sender timestamp
1443487903
DKIM signature
missing
Download raw message
Patch: +382 -175
---
 .../0006-Do-not-install-erlang-sources.patch       | 531 +++++++++++++++------
 main/erlang/APKBUILD                               |  26 +-
 2 files changed, 382 insertions(+), 175 deletions(-)

diff --git a/main/erlang/0006-Do-not-install-erlang-sources.patch b/main/erlang/0006-Do-not-install-erlang-sources.patch
index 8d14da5..9b7f421 100644
--- a/main/erlang/0006-Do-not-install-erlang-sources.patch
+++ b/main/erlang/0006-Do-not-install-erlang-sources.patch
@@ -1,14 +1,5 @@
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Mon, 21 Mar 2011 15:41:49 +0100
Subject: [PATCH] Do not install erlang sources

Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>

--- otp_src_18.0-orig/erts/preloaded/src/Makefile
+++ otp_src_18.0-fixed/erts/preloaded/src/Makefile
--- otp_src_18.1-orig/erts/preloaded/src/Makefile
+++ otp_src_18.1-fixed/erts/preloaded/src/Makefile
@@ -86,8 +86,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -18,8 +9,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/asn1/src/Makefile
+++ otp_src_18.0-fixed/lib/asn1/src/Makefile
--- otp_src_18.1-orig/lib/asn1/src/Makefile
+++ otp_src_18.1-fixed/lib/asn1/src/Makefile
@@ -155,7 +155,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -29,8 +20,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
 
--- otp_src_18.0-orig/lib/common_test/src/Makefile
+++ otp_src_18.0-fixed/lib/common_test/src/Makefile
--- otp_src_18.1-orig/lib/common_test/src/Makefile
+++ otp_src_18.1-fixed/lib/common_test/src/Makefile
@@ -144,7 +144,7 @@
 
 release_spec: opt
@@ -40,8 +31,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/compiler/src/Makefile
+++ otp_src_18.0-fixed/lib/compiler/src/Makefile
--- otp_src_18.1-orig/lib/compiler/src/Makefile
+++ otp_src_18.1-fixed/lib/compiler/src/Makefile
@@ -172,8 +172,8 @@
 
 release_spec: opt
@@ -53,8 +44,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/cosEvent/src/Makefile
+++ otp_src_18.0-fixed/lib/cosEvent/src/Makefile
--- otp_src_18.1-orig/lib/cosEvent/src/Makefile
+++ otp_src_18.1-fixed/lib/cosEvent/src/Makefile
@@ -203,7 +203,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -64,8 +55,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/cosEventDomain/src/Makefile
+++ otp_src_18.0-fixed/lib/cosEventDomain/src/Makefile
--- otp_src_18.1-orig/lib/cosEventDomain/src/Makefile
+++ otp_src_18.1-fixed/lib/cosEventDomain/src/Makefile
@@ -172,7 +172,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -75,8 +66,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/cosFileTransfer/src/Makefile
+++ otp_src_18.0-fixed/lib/cosFileTransfer/src/Makefile
--- otp_src_18.1-orig/lib/cosFileTransfer/src/Makefile
+++ otp_src_18.1-fixed/lib/cosFileTransfer/src/Makefile
@@ -180,9 +180,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -88,8 +79,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/cosNotification/src/Makefile
+++ otp_src_18.0-fixed/lib/cosNotification/src/Makefile
--- otp_src_18.1-orig/lib/cosNotification/src/Makefile
+++ otp_src_18.1-fixed/lib/cosNotification/src/Makefile
@@ -371,8 +371,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -100,8 +91,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/cosProperty/src/Makefile
+++ otp_src_18.0-fixed/lib/cosProperty/src/Makefile
--- otp_src_18.1-orig/lib/cosProperty/src/Makefile
+++ otp_src_18.1-fixed/lib/cosProperty/src/Makefile
@@ -180,8 +180,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -112,8 +103,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/cosTime/src/Makefile
+++ otp_src_18.0-fixed/lib/cosTime/src/Makefile
--- otp_src_18.1-orig/lib/cosTime/src/Makefile
+++ otp_src_18.1-fixed/lib/cosTime/src/Makefile
@@ -199,8 +199,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -124,8 +115,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/cosTransactions/src/Makefile
+++ otp_src_18.0-fixed/lib/cosTransactions/src/Makefile
--- otp_src_18.1-orig/lib/cosTransactions/src/Makefile
+++ otp_src_18.1-fixed/lib/cosTransactions/src/Makefile
@@ -174,7 +174,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -135,8 +126,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/crypto/src/Makefile
+++ otp_src_18.0-fixed/lib/crypto/src/Makefile
--- otp_src_18.1-orig/lib/crypto/src/Makefile
+++ otp_src_18.1-fixed/lib/crypto/src/Makefile
@@ -82,8 +82,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -146,8 +137,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/debugger/src/Makefile
+++ otp_src_18.0-fixed/lib/debugger/src/Makefile
--- otp_src_18.1-orig/lib/debugger/src/Makefile
+++ otp_src_18.1-fixed/lib/debugger/src/Makefile
@@ -117,7 +117,7 @@
 
 release_spec: opt
@@ -157,8 +148,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/dialyzer/src/Makefile
+++ otp_src_18.0-fixed/lib/dialyzer/src/Makefile
--- otp_src_18.1-orig/lib/dialyzer/src/Makefile
+++ otp_src_18.1-fixed/lib/dialyzer/src/Makefile
@@ -152,7 +152,7 @@
 
 release_spec: opt
@@ -168,8 +159,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 		"$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/diameter/src/Makefile
+++ otp_src_18.0-fixed/lib/diameter/src/Makefile
--- otp_src_18.1-orig/lib/diameter/src/Makefile
+++ otp_src_18.1-fixed/lib/diameter/src/Makefile
@@ -251,11 +251,8 @@
 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
 
@@ -184,8 +175,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
--- otp_src_18.0-orig/lib/edoc/src/Makefile
+++ otp_src_18.0-fixed/lib/edoc/src/Makefile
--- otp_src_18.1-orig/lib/edoc/src/Makefile
+++ otp_src_18.1-fixed/lib/edoc/src/Makefile
@@ -88,7 +88,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
@@ -195,8 +186,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 release_docs_spec:
 
--- otp_src_18.0-orig/lib/eldap/src/Makefile
+++ otp_src_18.0-fixed/lib/eldap/src/Makefile
--- otp_src_18.1-orig/lib/eldap/src/Makefile
+++ otp_src_18.1-fixed/lib/eldap/src/Makefile
@@ -99,10 +99,6 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
@@ -208,8 +199,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/erl_docgen/src/Makefile
+++ otp_src_18.0-fixed/lib/erl_docgen/src/Makefile
--- otp_src_18.1-orig/lib/erl_docgen/src/Makefile
+++ otp_src_18.1-fixed/lib/erl_docgen/src/Makefile
@@ -90,8 +90,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -219,8 +210,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/et/src/Makefile
+++ otp_src_18.0-fixed/lib/et/src/Makefile
--- otp_src_18.1-orig/lib/et/src/Makefile
+++ otp_src_18.1-fixed/lib/et/src/Makefile
@@ -109,7 +109,6 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -229,8 +220,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/eunit/src/Makefile
+++ otp_src_18.0-fixed/lib/eunit/src/Makefile
--- otp_src_18.1-orig/lib/eunit/src/Makefile
+++ otp_src_18.1-fixed/lib/eunit/src/Makefile
@@ -120,7 +120,6 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
@@ -239,8 +230,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/gs/src/Makefile
+++ otp_src_18.0-fixed/lib/gs/src/Makefile
--- otp_src_18.1-orig/lib/gs/src/Makefile
+++ otp_src_18.1-fixed/lib/gs/src/Makefile
@@ -109,8 +109,8 @@
 
 release_spec: opt
@@ -252,8 +243,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
--- otp_src_18.0-orig/lib/hipe/cerl/Makefile
+++ otp_src_18.0-fixed/lib/hipe/cerl/Makefile
--- otp_src_18.1-orig/lib/hipe/cerl/Makefile
+++ otp_src_18.1-fixed/lib/hipe/cerl/Makefile
@@ -102,7 +102,7 @@
 
 release_spec: opt
@@ -263,8 +254,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/flow/Makefile
+++ otp_src_18.0-fixed/lib/hipe/flow/Makefile
--- otp_src_18.1-orig/lib/hipe/flow/Makefile
+++ otp_src_18.1-fixed/lib/hipe/flow/Makefile
@@ -102,7 +102,7 @@
 
 release_spec: opt
@@ -274,8 +265,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/icode/Makefile
+++ otp_src_18.0-fixed/lib/hipe/icode/Makefile
--- otp_src_18.1-orig/lib/hipe/icode/Makefile
+++ otp_src_18.1-fixed/lib/hipe/icode/Makefile
@@ -120,7 +120,7 @@
 
 release_spec: opt
@@ -285,8 +276,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/llvm/Makefile
+++ otp_src_18.0-fixed/lib/hipe/llvm/Makefile
--- otp_src_18.1-orig/lib/hipe/llvm/Makefile
+++ otp_src_18.1-fixed/lib/hipe/llvm/Makefile
@@ -103,7 +103,7 @@
 
 release_spec: opt
@@ -296,8 +287,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
--- otp_src_18.0-orig/lib/hipe/main/Makefile
+++ otp_src_18.0-fixed/lib/hipe/main/Makefile
--- otp_src_18.1-orig/lib/hipe/main/Makefile
+++ otp_src_18.1-fixed/lib/hipe/main/Makefile
@@ -118,7 +118,7 @@
 release_spec: opt
 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
@@ -307,8 +298,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/misc/Makefile
+++ otp_src_18.0-fixed/lib/hipe/misc/Makefile
--- otp_src_18.1-orig/lib/hipe/misc/Makefile
+++ otp_src_18.1-fixed/lib/hipe/misc/Makefile
@@ -102,7 +102,7 @@
 
 release_spec: opt
@@ -318,8 +309,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/rtl/Makefile
+++ otp_src_18.0-fixed/lib/hipe/rtl/Makefile
--- otp_src_18.1-orig/lib/hipe/rtl/Makefile
+++ otp_src_18.1-fixed/lib/hipe/rtl/Makefile
@@ -105,7 +105,7 @@
 
 release_spec: opt
@@ -329,8 +320,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/hipe/util/Makefile
+++ otp_src_18.0-fixed/lib/hipe/util/Makefile
--- otp_src_18.1-orig/lib/hipe/util/Makefile
+++ otp_src_18.1-fixed/lib/hipe/util/Makefile
@@ -50,7 +50,6 @@
 endif
 MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES)
@@ -348,8 +339,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/ic/src/Makefile
+++ otp_src_18.0-fixed/lib/ic/src/Makefile
--- otp_src_18.1-orig/lib/ic/src/Makefile
+++ otp_src_18.1-fixed/lib/ic/src/Makefile
@@ -200,7 +200,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
@@ -359,8 +350,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
 	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
--- otp_src_18.0-orig/lib/inets/src/ftp/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/ftp/Makefile
--- otp_src_18.1-orig/lib/inets/src/ftp/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/ftp/Makefile
@@ -91,7 +91,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -370,8 +361,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/inets/src/http_client/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/http_client/Makefile
--- otp_src_18.1-orig/lib/inets/src/http_client/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/http_client/Makefile
@@ -92,7 +92,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -381,8 +372,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/inets/src/http_lib/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/http_lib/Makefile
--- otp_src_18.1-orig/lib/inets/src/http_lib/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/http_lib/Makefile
@@ -90,7 +90,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -392,8 +383,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/inets/src/http_server/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/http_server/Makefile
--- otp_src_18.1-orig/lib/inets/src/http_server/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/http_server/Makefile
@@ -127,7 +127,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -403,8 +394,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/inets/src/inets_app/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/inets_app/Makefile
--- otp_src_18.1-orig/lib/inets/src/inets_app/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/inets_app/Makefile
@@ -116,7 +116,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -414,8 +405,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/inets/src/tftp/Makefile
+++ otp_src_18.0-fixed/lib/inets/src/tftp/Makefile
--- otp_src_18.1-orig/lib/inets/src/tftp/Makefile
+++ otp_src_18.1-fixed/lib/inets/src/tftp/Makefile
@@ -96,7 +96,7 @@
 release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -425,8 +416,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/kernel/src/Makefile
+++ otp_src_18.0-fixed/lib/kernel/src/Makefile
--- otp_src_18.1-orig/lib/kernel/src/Makefile
+++ otp_src_18.1-fixed/lib/kernel/src/Makefile
@@ -200,7 +200,6 @@
 
 release_spec: opt
@@ -435,8 +426,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/megaco/src/app/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/app/Makefile
--- otp_src_18.1-orig/lib/megaco/src/app/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/app/Makefile
@@ -114,7 +114,7 @@
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -446,8 +437,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/megaco/src/binary/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/binary/Makefile
--- otp_src_18.1-orig/lib/megaco/src/binary/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/binary/Makefile
@@ -176,7 +176,7 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -457,8 +448,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/megaco/src/engine/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/engine/Makefile
--- otp_src_18.1-orig/lib/megaco/src/engine/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/engine/Makefile
@@ -102,7 +102,7 @@
 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -468,8 +459,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
 
 
--- otp_src_18.0-orig/lib/megaco/src/flex/Makefile.in
+++ otp_src_18.0-fixed/lib/megaco/src/flex/Makefile.in
--- otp_src_18.1-orig/lib/megaco/src/flex/Makefile.in
+++ otp_src_18.1-fixed/lib/megaco/src/flex/Makefile.in
@@ -268,8 +268,6 @@
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
@@ -479,8 +470,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
--- otp_src_18.0-orig/lib/megaco/src/tcp/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/tcp/Makefile
--- otp_src_18.1-orig/lib/megaco/src/tcp/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/tcp/Makefile
@@ -94,7 +94,7 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -490,8 +481,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/megaco/src/text/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/text/Makefile
--- otp_src_18.1-orig/lib/megaco/src/text/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/text/Makefile
@@ -135,7 +135,7 @@
 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -501,8 +492,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/megaco/src/udp/Makefile
+++ otp_src_18.0-fixed/lib/megaco/src/udp/Makefile
--- otp_src_18.1-orig/lib/megaco/src/udp/Makefile
+++ otp_src_18.1-fixed/lib/megaco/src/udp/Makefile
@@ -94,7 +94,7 @@
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
@@ -512,8 +503,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/mnesia/src/Makefile
+++ otp_src_18.0-fixed/lib/mnesia/src/Makefile
--- otp_src_18.1-orig/lib/mnesia/src/Makefile
+++ otp_src_18.1-fixed/lib/mnesia/src/Makefile
@@ -133,7 +133,7 @@
 
 release_spec: opt
@@ -523,8 +514,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/observer/src/Makefile
+++ otp_src_18.0-fixed/lib/observer/src/Makefile
--- otp_src_18.1-orig/lib/observer/src/Makefile
+++ otp_src_18.1-fixed/lib/observer/src/Makefile
@@ -152,7 +152,6 @@
 
 release_spec: opt
@@ -533,8 +524,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
--- otp_src_18.0-orig/lib/odbc/src/Makefile
+++ otp_src_18.0-fixed/lib/odbc/src/Makefile
--- otp_src_18.1-orig/lib/odbc/src/Makefile
+++ otp_src_18.1-fixed/lib/odbc/src/Makefile
@@ -110,7 +110,7 @@
 
 release_spec: opt
@@ -544,8 +535,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/orber/COSS/CosNaming/Makefile
+++ otp_src_18.0-fixed/lib/orber/COSS/CosNaming/Makefile
--- otp_src_18.1-orig/lib/orber/COSS/CosNaming/Makefile
+++ otp_src_18.1-fixed/lib/orber/COSS/CosNaming/Makefile
@@ -145,8 +145,8 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
@@ -557,8 +548,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 
 release_docs_spec:
--- otp_src_18.0-orig/lib/orber/src/Makefile
+++ otp_src_18.0-fixed/lib/orber/src/Makefile
--- otp_src_18.1-orig/lib/orber/src/Makefile
+++ otp_src_18.1-fixed/lib/orber/src/Makefile
@@ -253,7 +253,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
@@ -568,8 +559,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/os_mon/src/Makefile
+++ otp_src_18.0-fixed/lib/os_mon/src/Makefile
--- otp_src_18.1-orig/lib/os_mon/src/Makefile
+++ otp_src_18.1-fixed/lib/os_mon/src/Makefile
@@ -105,7 +105,6 @@
 
 release_spec: opt
@@ -578,8 +569,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/ose/src/Makefile
+++ otp_src_18.0-fixed/lib/ose/src/Makefile
--- otp_src_18.1-orig/lib/ose/src/Makefile
+++ otp_src_18.1-fixed/lib/ose/src/Makefile
@@ -94,9 +94,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -590,8 +581,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/otp_mibs/src/Makefile
+++ otp_src_18.0-fixed/lib/otp_mibs/src/Makefile
--- otp_src_18.1-orig/lib/otp_mibs/src/Makefile
+++ otp_src_18.1-fixed/lib/otp_mibs/src/Makefile
@@ -96,8 +96,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -601,8 +592,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/parsetools/src/Makefile
+++ otp_src_18.0-fixed/lib/parsetools/src/Makefile
--- otp_src_18.1-orig/lib/parsetools/src/Makefile
+++ otp_src_18.1-fixed/lib/parsetools/src/Makefile
@@ -91,8 +91,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -612,8 +603,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/percept/src/Makefile
+++ otp_src_18.0-fixed/lib/percept/src/Makefile
--- otp_src_18.1-orig/lib/percept/src/Makefile
+++ otp_src_18.1-fixed/lib/percept/src/Makefile
@@ -97,7 +97,6 @@
 
 release_spec: opt
@@ -622,8 +613,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/public_key/asn1/Makefile
+++ otp_src_18.0-fixed/lib/public_key/asn1/Makefile
--- otp_src_18.1-orig/lib/public_key/asn1/Makefile
+++ otp_src_18.1-fixed/lib/public_key/asn1/Makefile
@@ -96,8 +96,8 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
@@ -635,8 +626,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/public_key/src/Makefile
+++ otp_src_18.0-fixed/lib/public_key/src/Makefile
--- otp_src_18.1-orig/lib/public_key/src/Makefile
+++ otp_src_18.1-fixed/lib/public_key/src/Makefile
@@ -50,8 +50,6 @@
 
 HRL_FILES = $(INCLUDE)/public_key.hrl 
@@ -655,8 +646,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/reltool/src/Makefile
+++ otp_src_18.0-fixed/lib/reltool/src/Makefile
--- otp_src_18.1-orig/lib/reltool/src/Makefile
+++ otp_src_18.1-fixed/lib/reltool/src/Makefile
@@ -100,7 +100,7 @@
 
 release_spec: opt
@@ -666,8 +657,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/runtime_tools/src/Makefile
+++ otp_src_18.0-fixed/lib/runtime_tools/src/Makefile
--- otp_src_18.1-orig/lib/runtime_tools/src/Makefile
+++ otp_src_18.1-fixed/lib/runtime_tools/src/Makefile
@@ -97,8 +97,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -677,8 +668,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
--- otp_src_18.0-orig/lib/sasl/src/Makefile
+++ otp_src_18.0-fixed/lib/sasl/src/Makefile
--- otp_src_18.1-orig/lib/sasl/src/Makefile
+++ otp_src_18.1-fixed/lib/sasl/src/Makefile
@@ -93,7 +93,6 @@
 
 release_spec: opt
@@ -687,8 +678,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/snmp/src/agent/Makefile
+++ otp_src_18.0-fixed/lib/snmp/src/agent/Makefile
--- otp_src_18.1-orig/lib/snmp/src/agent/Makefile
+++ otp_src_18.1-fixed/lib/snmp/src/agent/Makefile
@@ -131,7 +131,7 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -698,8 +689,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/snmp/src/app/Makefile
+++ otp_src_18.0-fixed/lib/snmp/src/app/Makefile
--- otp_src_18.1-orig/lib/snmp/src/app/Makefile
+++ otp_src_18.1-fixed/lib/snmp/src/app/Makefile
@@ -132,7 +132,7 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -709,8 +700,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/snmp/src/compile/Makefile
+++ otp_src_18.0-fixed/lib/snmp/src/compile/Makefile
--- otp_src_18.1-orig/lib/snmp/src/compile/Makefile
+++ otp_src_18.1-fixed/lib/snmp/src/compile/Makefile
@@ -123,7 +123,7 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -720,8 +711,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
--- otp_src_18.0-orig/lib/snmp/src/manager/Makefile
+++ otp_src_18.0-fixed/lib/snmp/src/manager/Makefile
--- otp_src_18.1-orig/lib/snmp/src/manager/Makefile
+++ otp_src_18.1-fixed/lib/snmp/src/manager/Makefile
@@ -114,7 +114,7 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -731,8 +722,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/snmp/src/misc/Makefile
+++ otp_src_18.0-fixed/lib/snmp/src/misc/Makefile
--- otp_src_18.1-orig/lib/snmp/src/misc/Makefile
+++ otp_src_18.1-fixed/lib/snmp/src/misc/Makefile
@@ -112,7 +112,7 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -742,9 +733,9 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/ssh/src/Makefile
+++ otp_src_18.0-fixed/lib/ssh/src/Makefile
@@ -136,7 +136,7 @@
--- otp_src_18.1-orig/lib/ssh/src/Makefile
+++ otp_src_18.1-fixed/lib/ssh/src/Makefile
@@ -135,7 +135,7 @@
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -753,8 +744,232 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/ssl/src/Makefile
+++ otp_src_18.0-fixed/lib/ssl/src/Makefile
--- /dev/null
+++ otp_src_18.1-fixed/lib/ssh/src/Makefile.orig
@@ -0,0 +1,221 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2013. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(SSH_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN)
+
+# ----------------------------------------------------
+# Common Macros
+# ----------------------------------------------------
+
+# Behaviour (api) modules are first so they are compiled when
+# the compiler reaches a callback module using them.
+BEHAVIOUR_MODULES= \
+	ssh_sftpd_file_api \
+        ssh_channel \
+	ssh_daemon_channel \
+	ssh_client_key_api \
+	ssh_server_key_api
+
+MODULES= \
+	ssh \
+	ssh_sup \
+	sshc_sup \
+	sshd_sup \
+	ssh_connection_sup \
+	ssh_connection \
+	ssh_connection_handler \
+	ssh_shell \
+	ssh_system_sup \
+	ssh_subsystem_sup \
+	ssh_channel_sup \
+	ssh_acceptor_sup \
+	ssh_acceptor \
+	ssh_app \
+	ssh_auth\
+	ssh_bits \
+	ssh_cli \
+	ssh_file \
+	ssh_io \
+	ssh_info \
+	ssh_message \
+	ssh_no_io \
+	ssh_sftp \
+	ssh_sftpd \
+	ssh_sftpd_file\
+	ssh_transport \
+	ssh_xfer
+
+HRL_FILES =
+
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
+
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+APP_FILE= ssh.app
+APPUP_FILE= ssh.appup
+
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_userauth.hrl ssh_xfer.hrl
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+EXTRA_ERLC_FLAGS = +warn_unused_vars
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+	-pz $(EBIN) \
+	-pz $(ERL_TOP)/lib/public_key/ebin \
+	$(EXTRA_ERLC_FLAGS)
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+
+clean:
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES)
+	rm -f errs core *~
+
+$(APP_TARGET):	$(APP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+
+
+release_docs_spec:
+
+
+deps:
+	erlc -M $(ERL_FILES) \
+	| sed 's@$(ERL_TOP)/lib@../..@g' \
+	| sed 's/\.$(EMULATOR)/\.$$\(EMULATOR\)/' \
+	| sed 's@^ssh_@$$(EBIN)/ssh_@'
+
+ssh.$(EMULATOR): ssh.erl ssh.hrl ssh_connect.hrl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ../../kernel/include/file.hrl
+$(EBIN)/ssh_sup.$(EMULATOR): ssh_sup.erl
+sshc_sup.$(EMULATOR): sshc_sup.erl
+sshd_sup.$(EMULATOR): sshd_sup.erl ssh.hrl
+$(EBIN)/ssh_connection_sup.$(EMULATOR): ssh_connection_sup.erl
+$(EBIN)/ssh_connection.$(EMULATOR): ssh_connection.erl ssh.hrl ssh_connect.hrl \
+  ssh_transport.hrl
+$(EBIN)/ssh_connection_handler.$(EMULATOR): ssh_connection_handler.erl ssh.hrl \
+  ssh_transport.hrl ssh_auth.hrl ssh_connect.hrl
+$(EBIN)/ssh_shell.$(EMULATOR): ssh_shell.erl ssh_connect.hrl
+$(EBIN)/ssh_system_sup.$(EMULATOR): ssh_system_sup.erl ssh.hrl
+$(EBIN)/ssh_subsystem_sup.$(EMULATOR): ssh_subsystem_sup.erl
+$(EBIN)/ssh_channel_sup.$(EMULATOR): ssh_channel_sup.erl
+$(EBIN)/ssh_acceptor_sup.$(EMULATOR): ssh_acceptor_sup.erl ssh.hrl
+$(EBIN)/ssh_acceptor.$(EMULATOR): ssh_acceptor.erl ssh.hrl
+$(EBIN)/ssh_app.$(EMULATOR): ssh_app.erl
+$(EBIN)/ssh_auth.$(EMULATOR): ssh_auth.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ssh.hrl ssh_auth.hrl ssh_transport.hrl
+$(EBIN)/ssh_bits.$(EMULATOR): ssh_bits.erl ssh.hrl
+$(EBIN)/ssh_cli.$(EMULATOR): ssh_cli.erl ssh.hrl ssh_connect.hrl
+$(EBIN)/ssh_file.$(EMULATOR): ssh_file.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ../../kernel/include/file.hrl ssh.hrl
+$(EBIN)/ssh_io.$(EMULATOR): ssh_io.erl ssh.hrl
+$(EBIN)/ssh_info.$(EMULATOR): ssh_info.erl
+$(EBIN)/ssh_message.$(EMULATOR): ssh_message.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ssh.hrl ssh_connect.hrl ssh_auth.hrl ssh_transport.hrl
+$(EBIN)/ssh_no_io.$(EMULATOR): ssh_no_io.erl ssh_transport.hrl
+$(EBIN)/ssh_sftp.$(EMULATOR): ssh_sftp.erl \
+  ../../kernel/include/file.hrl ssh.hrl \
+  ssh_xfer.hrl
+$(EBIN)/ssh_sftpd.$(EMULATOR): ssh_sftpd.erl \
+  ../../kernel/include/file.hrl ssh.hrl \
+  ssh_xfer.hrl
+$(EBIN)/ssh_sftpd_file.$(EMULATOR): ssh_sftpd_file.erl
+$(EBIN)/ssh_transport.$(EMULATOR): ssh_transport.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ../../kernel/include/inet.hrl \
+  ssh_transport.hrl ssh.hrl
+$(EBIN)/ssh_xfer.$(EMULATOR): ssh_xfer.erl ssh.hrl ssh_xfer.hrl
+$(EBIN)/ssh_sftpd_file_api.$(EMULATOR): ssh_sftpd_file_api.erl
+$(EBIN)/ssh_channel.$(EMULATOR): ssh_channel.erl ssh_connect.hrl
+$(EBIN)/ssh_daemon_channel.$(EMULATOR): ssh_daemon_channel.erl
+$(EBIN)/ssh_client_key_api.$(EMULATOR): ssh_client_key_api.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ssh.hrl
+$(EBIN)/ssh_server_key_api.$(EMULATOR): ssh_server_key_api.erl \
+  ../../public_key/include/public_key.hrl \
+  ../../public_key/include/OTP-PUB-KEY.hrl \
+  ../../public_key/include/PKCS-FRAME.hrl \
+  ssh.hrl
+
--- otp_src_18.1-orig/lib/ssl/src/Makefile
+++ otp_src_18.1-fixed/lib/ssl/src/Makefile
@@ -141,7 +141,7 @@
 
 release_spec: opt
@@ -764,8 +979,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/stdlib/src/Makefile
+++ otp_src_18.0-fixed/lib/stdlib/src/Makefile
--- otp_src_18.1-orig/lib/stdlib/src/Makefile
+++ otp_src_18.1-fixed/lib/stdlib/src/Makefile
@@ -207,7 +207,6 @@
 
 release_spec: opt
@@ -774,8 +989,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/syntax_tools/src/Makefile
+++ otp_src_18.0-fixed/lib/syntax_tools/src/Makefile
--- otp_src_18.1-orig/lib/syntax_tools/src/Makefile
+++ otp_src_18.1-fixed/lib/syntax_tools/src/Makefile
@@ -100,8 +100,6 @@
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
@@ -785,8 +1000,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
 
--- otp_src_18.0-orig/lib/test_server/src/Makefile
+++ otp_src_18.0-fixed/lib/test_server/src/Makefile
--- otp_src_18.1-orig/lib/test_server/src/Makefile
+++ otp_src_18.1-fixed/lib/test_server/src/Makefile
@@ -124,7 +124,6 @@
 
 release_spec: opt
@@ -795,8 +1010,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
--- otp_src_18.0-orig/lib/tools/src/Makefile
+++ otp_src_18.0-fixed/lib/tools/src/Makefile
--- otp_src_18.1-orig/lib/tools/src/Makefile
+++ otp_src_18.1-fixed/lib/tools/src/Makefile
@@ -107,7 +107,7 @@
 
 release_spec: opt
@@ -806,8 +1021,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/typer/src/Makefile
+++ otp_src_18.0-fixed/lib/typer/src/Makefile
--- otp_src_18.1-orig/lib/typer/src/Makefile
+++ otp_src_18.1-fixed/lib/typer/src/Makefile
@@ -102,9 +102,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -818,8 +1033,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
 
--- otp_src_18.0-orig/lib/webtool/src/Makefile
+++ otp_src_18.0-fixed/lib/webtool/src/Makefile
--- otp_src_18.1-orig/lib/webtool/src/Makefile
+++ otp_src_18.1-fixed/lib/webtool/src/Makefile
@@ -88,8 +88,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -829,8 +1044,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/wx/src/Makefile
+++ otp_src_18.0-fixed/lib/wx/src/Makefile
--- otp_src_18.1-orig/lib/wx/src/Makefile
+++ otp_src_18.1-fixed/lib/wx/src/Makefile
@@ -122,9 +122,9 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt 
@@ -843,8 +1058,8 @@ Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
--- otp_src_18.0-orig/lib/xmerl/src/Makefile
+++ otp_src_18.0-fixed/lib/xmerl/src/Makefile
--- otp_src_18.1-orig/lib/xmerl/src/Makefile
+++ otp_src_18.1-fixed/lib/xmerl/src/Makefile
@@ -218,9 +218,7 @@
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
diff --git a/main/erlang/APKBUILD b/main/erlang/APKBUILD
index c4e04a2..eca4c68 100644
--- a/main/erlang/APKBUILD
+++ b/main/erlang/APKBUILD
@@ -2,9 +2,9 @@
# Maintainer: Marlus Saraiva <marlus.saraiva@gmail.com>

pkgname=erlang
pkgver=18.0.2
_srcver=18.0
pkgrel=1
pkgver=18.1
_srcver=18.1
pkgrel=0
pkgdesc="General-purpose programming language and runtime environment"
url="http://www.erlang.org/"
license="ASL 2.0"
@@ -76,8 +76,6 @@ source="http://www.erlang.org/download/otp_src_$_srcver.tar.gz
        0010-fix-nteventlog-remove.patch
        0020-remove-private-unit32.patch
        0030-replace_glibc_check.patch
        0040-otp-update-version-18.0.1.patch
        0050-otp-update-version-18.0.2.patch
        0060-set-disksup_posix_only-to-true.patch"

_builddir="$srcdir"/otp_src_$_srcver
@@ -211,45 +209,39 @@ dev() {
}
	

md5sums="232acb0c278ee05c8d787cbaf6399be5  otp_src_18.0.tar.gz
md5sums="fa64015fdd133e155b5b19bf90ac8678  otp_src_18.1.tar.gz
11d2bfea3dd3138409337d62f2348ff2  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
ef4b726309a749010553259080960753  0002-Remove-rpath.patch
458118f96fb0c973a30630c070bd94aa  0003-Do-not-install-C-sources.patch
1c3b158ac8408fced9a0f3630f4498f1  0004-Do-not-install-Java-sources.patch
f4aa0cc27dc57ea4dcd57191b1948a4d  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
37861f7e1e02993018d6751d0d7bb83c  0006-Do-not-install-erlang-sources.patch
115f105e3af69b94e078cc56cfd6f062  0006-Do-not-install-erlang-sources.patch
b438c37818b5c82443682c3693dd7e53  0007-Split-off-webtool-dependency-from-tools.patch
0dd300003ff68fc46dc3c839c2541d53  0010-fix-nteventlog-remove.patch
062605d7f01f4685f1897ba2decc23a8  0020-remove-private-unit32.patch
7a5c956b7bf79e34a0f980d1e2a65bee  0030-replace_glibc_check.patch
e621bd76d8e19af2d60e4d1a11ddbca3  0040-otp-update-version-18.0.1.patch
4ade398725d713b5cf577c4c072c2d95  0050-otp-update-version-18.0.2.patch
d17fbaafa9f7820ade09b239c00aede6  0060-set-disksup_posix_only-to-true.patch"
sha256sums="a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa  otp_src_18.0.tar.gz
sha256sums="e4a147228a6b7fa60dce05c8adfb3cbc254d97cf6e45456d93d93adbde8b0f11  otp_src_18.1.tar.gz
536e78192f915733cbbb264883af6d9b11c9e70c2c4d3d825b58c4dbec36db86  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
b2e5844215d7f5f5026a77342dd698d16103cc726d23f8265bcc8399d1a82bb9  0002-Remove-rpath.patch
81062f0eb9a72cbfac600fab56823161f92e1e5107b359f27f9f0ec511b8aec5  0003-Do-not-install-C-sources.patch
2ed61274decb534ab4142bd0a2116a75e3fe82d33a8ff145524173ce5773b0e2  0004-Do-not-install-Java-sources.patch
71c8a55fe036d5a04ba2c008b51d8950c3f18d83edaffb9bef2a9d19dd2f79f3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
b810ef25504fbce3f9a0d4ae1e02fc4225b01fd68daa88566f6f8de37e26b351  0006-Do-not-install-erlang-sources.patch
d5dd09daa693729f93305d9fc4391faca8bd601f572df02db5da1bf01fa8dc58  0006-Do-not-install-erlang-sources.patch
9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf  0007-Split-off-webtool-dependency-from-tools.patch
019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758  0010-fix-nteventlog-remove.patch
0b63ff5ce4e642d4225d5cc4d52d88dd5daf83ce5a2549ba0e5a14ce05e17ac2  0020-remove-private-unit32.patch
e3158dbb4bcb4677ceda39a374326c069de78a52e598ef8169a288b86a040a62  0030-replace_glibc_check.patch
a014ad5c5da2512672af7a98ca072d6aa2615af2d1cc8e67a6cc611096cc922a  0040-otp-update-version-18.0.1.patch
c51691da93e54e6b42c234706070dae74079cea00e6b720c9513663b2d7ed0a8  0050-otp-update-version-18.0.2.patch
3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429  0060-set-disksup_posix_only-to-true.patch"
sha512sums="84ec2a3834270c1babe153572d6187faa36c12128e604037d55be01719788c0dd79d46769ea7090d530b746206a25fe02346b02849abee10ee41ed4ac7567c02  otp_src_18.0.tar.gz
sha512sums="31e3a4f3d8da7877757fa4df427c59462cb68e0177f93698146ce17127406fd0ee77f819044cef10e4a18ed075deb44343d915148cf1fd4bce09a1e39edaaee6  otp_src_18.1.tar.gz
172f9b0f61748bf2f04737df0451bcc9c0812db0f365f0ef7c7c244fceb991987f79a5274eea578a89cc7d077f84645d1395d9dbcbf14010268b896a080c2ccf  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
97c40c185b71b23ffcb924639af390b9a0be897070e396a9413e193e6d43048dfe3b86bcd0c5598b81a66ce1349de9e09f5228a452b51b6612cd947bbafb6377  0002-Remove-rpath.patch
1cae89d1e8f9d375ae08c7de2b8f7a5143bcded90eef878e97c408542a50e9a880166311820013301e46364be0ae090d3fc515b6f915ead14e787b98290beec1  0003-Do-not-install-C-sources.patch
b174e3c9103aa26e3b4993ae77b849a55f733e6f8e5dd7bb641a8548aea7fcc91b99d772c91ff8864fff5c30b388438f8cb41d7ac941a86fc7bb1891f9838068  0004-Do-not-install-Java-sources.patch
923addcb1f6472829ba13ccc91ad3cef161f269478404f0a19bc4997118e06edd7459011a60769eb393eac930f30d4bd6c5526301382a5f9815862237f4664d3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
20a7200fe811b5256ef89bcbf19dd6ebb29c7c9109311f6d3adca2ade42c13ca63a28ff8f3e49308feaeda1e30a4e3a7e1083edf57b42219d0794dddc0f4a464  0006-Do-not-install-erlang-sources.patch
12aff88e06a4fe4f25bb7ae16257195779388f903bbb38dfcfa1a36f81874493eb5e73836c340c60ddfe28e175fe165754c695d4f77b401cc84c6f711ce2c24e  0006-Do-not-install-erlang-sources.patch
d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3  0007-Split-off-webtool-dependency-from-tools.patch
b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c  0010-fix-nteventlog-remove.patch
18f70c3a99ac8c44bc9d90dc3f0c072ad4df4ffe57a8d0677087c9e940ba138d7a7698d5cdbbe14875a6012d353a679fdb33d40fca3a3211f712af8c4b0cb0b4  0020-remove-private-unit32.patch
b554882bee1a70322cc8c5b973986047deaf4528fe1371df39cf72b27b2497a859463bdf8847ea6ea96cb0caaa6bd143c96a5dee28839164a547a66a30fcffd0  0030-replace_glibc_check.patch
5f6f5856fc60f7bc333fb2736bcf0d8dd475658621bb8ded8a9f664bb045ba5b0768ec990a05e5c35c5dfaa284f10567ff61b7a3c521a907553561c50c068ad1  0040-otp-update-version-18.0.1.patch
cae82f07a8eb811f47a2a7553626d536e16a368fe8292dcee6c991f4f069e7821e0a2310cc86f65313b87ac6691a406ca92fc36b7ab32079b060813602c9f16a  0050-otp-update-version-18.0.2.patch
f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071  0060-set-disksup_posix_only-to-true.patch"
-- 
2.4.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20150930144006.3947aa18@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1443487903-19624-1-git-send-email-marlus.saraiva@gmail.com> (view parent)
Sender timestamp
1443616806
DKIM signature
missing
Download raw message
On Tue, 29 Sep 2015 00:51:43 +0000
Marlus Saraiva <marlus.saraiva@gmail.com> wrote:

> ---
>  .../0006-Do-not-install-erlang-sources.patch       | 531 +++++++++++++++------
>  main/erlang/APKBUILD                               |  26 +-
>  2 files changed, 382 insertions(+), 175 deletions(-)
> 
> diff --git a/main/erlang/0006-Do-not-install-erlang-sources.patch b/main/erlang/0006-Do-not-install-erlang-sources.patch
> index 8d14da5..9b7f421 100644
> --- a/main/erlang/0006-Do-not-install-erlang-sources.patch
> +++ b/main/erlang/0006-Do-not-install-erlang-sources.patch
> @@ -1,14 +1,5 @@
> -From: Hans Ulrich Niedermann <hun@n-dimensional.de>
> -Date: Mon, 21 Mar 2011 15:41:49 +0100
> -Subject: [PATCH] Do not install erlang sources
> -
> -Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
> -
> -Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
> -Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
> -

...

> +--- /dev/null
> ++++ otp_src_18.1-fixed/lib/ssh/src/Makefile.orig

I suppose adding Makefile.orig was not intentional?

I also get a build failure:
 CC     obj/x86_64-alpine-linux-musl/opt/smp/hipe_x86_signal.o
hipe/hipe_x86_signal.c:233:0: warning: "_NSIG" redefined
 #define _NSIG NSIG
 ^
In file included from /usr/include/signal.h:243:0,
                 from hipe/hipe_x86_signal.c:48:
/usr/include/bits/signal.h:129:0: note: this is the location of the previous definition
 #define _NSIG 65
 ^
hipe/hipe_x86_signal.c:224:21: warning: no previous prototype for '_sigaction' [-Wmissing-prototypes]
 #define __SIGACTION _sigaction
                     ^
hipe/hipe_x86_signal.c:266:5: note: in expansion of macro '__SIGACTION'
 int __SIGACTION(int signum, const struct sigaction *act, struct sigaction *olda
     ^
In file included from hipe/hipe_x86_signal.c:48:0:
hipe/hipe_x86_signal.c: In function 'hipe_signal_init':
hipe/hipe_x86_signal.c:233:15: error: '_NSIG' undeclared (first use in this function)
 #define _NSIG NSIG
               ^
hipe/hipe_x86_signal.c:341:21: note: in expansion of macro '_NSIG'
     for (i = 1; i < _NSIG; ++i) {
                     ^
hipe/hipe_x86_signal.c:233:15: note: each undeclared identifier is reported only once for each function it appears in
 #define _NSIG NSIG
               ^
hipe/hipe_x86_signal.c:341:21: note: in expansion of macro '_NSIG'
     for (i = 1; i < _NSIG; ++i) {
                     ^
x86_64-alpine-linux-musl/Makefile:956: recipe for target
'obj/x86_64-alpine-linux-musl/opt/smp/hipe_x86_signal.o' failed


-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Details
Message ID
<CAJvhf-kUmOoddcHD=PL_0c6amT3PgcQi6iRSJY-CzA-iV2eOWA@mail.gmail.com>
In-Reply-To
<20150930144006.3947aa18@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1443701957
DKIM signature
missing
Download raw message
2015-09-30 9:40 GMT-03:00 Natanael Copa <ncopa@alpinelinux.org>:

> On Tue, 29 Sep 2015 00:51:43 +0000
> Marlus Saraiva <marlus.saraiva@gmail.com> wrote:
>
> > ---
> >  .../0006-Do-not-install-erlang-sources.patch       | 531
> +++++++++++++++------
> >  main/erlang/APKBUILD                               |  26 +-
> >  2 files changed, 382 insertions(+), 175 deletions(-)
> >
> > diff --git a/main/erlang/0006-Do-not-install-erlang-sources.patch
> b/main/erlang/0006-Do-not-install-erlang-sources.patch
> > index 8d14da5..9b7f421 100644
> > --- a/main/erlang/0006-Do-not-install-erlang-sources.patch
> > +++ b/main/erlang/0006-Do-not-install-erlang-sources.patch
> > @@ -1,14 +1,5 @@
> > -From: Hans Ulrich Niedermann <hun@n-dimensional.de>
> > -Date: Mon, 21 Mar 2011 15:41:49 +0100
> > -Subject: [PATCH] Do not install erlang sources
> > -
> > -Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
> > -
> > -Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
> > -Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
> > -
>
> ...
>
> > +--- /dev/null
> > ++++ otp_src_18.1-fixed/lib/ssh/src/Makefile.orig
>
> I suppose adding Makefile.orig was not intentional?
>
>
Sorry about that :)


> I also get a build failure:
>  CC     obj/x86_64-alpine-linux-musl/opt/smp/hipe_x86_signal.o
> hipe/hipe_x86_signal.c:233:0: warning: "_NSIG" redefined
>  #define _NSIG NSIG
>  ^
> In file included from /usr/include/signal.h:243:0,
>                  from hipe/hipe_x86_signal.c:48:
> /usr/include/bits/signal.h:129:0: note: this is the location of the
> previous definition
>  #define _NSIG 65
>  ^
> hipe/hipe_x86_signal.c:224:21: warning: no previous prototype for
> '_sigaction' [-Wmissing-prototypes]
>  #define __SIGACTION _sigaction
>                      ^
> hipe/hipe_x86_signal.c:266:5: note: in expansion of macro '__SIGACTION'
>  int __SIGACTION(int signum, const struct sigaction *act, struct sigaction
> *olda
>      ^
> In file included from hipe/hipe_x86_signal.c:48:0:
> hipe/hipe_x86_signal.c: In function 'hipe_signal_init':
> hipe/hipe_x86_signal.c:233:15: error: '_NSIG' undeclared (first use in
> this function)
>  #define _NSIG NSIG
>                ^
> hipe/hipe_x86_signal.c:341:21: note: in expansion of macro '_NSIG'
>      for (i = 1; i < _NSIG; ++i) {
>                      ^
> hipe/hipe_x86_signal.c:233:15: note: each undeclared identifier is
> reported only once for each function it appears in
>  #define _NSIG NSIG
>                ^
> hipe/hipe_x86_signal.c:341:21: note: in expansion of macro '_NSIG'
>      for (i = 1; i < _NSIG; ++i) {
>                      ^
> x86_64-alpine-linux-musl/Makefile:956: recipe for target
> 'obj/x86_64-alpine-linux-musl/opt/smp/hipe_x86_signal.o' failed
>
>
This happened because you had m4 installed in your environment and I
didn't. When m4 is found, hipe is enabled by default. If hipe is enabled,
we need to apply an additional patch. I already have the patch working fine
and will submit it among the other changes. My question is: should I add m4
to "makedepends" or should I assume it's already installed in your
environment before you build the packages?


> -nc
>
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20151001175449.0b7c3114@ncopa-laptop>
In-Reply-To
<CAJvhf-kUmOoddcHD=PL_0c6amT3PgcQi6iRSJY-CzA-iV2eOWA@mail.gmail.com> (view parent)
Sender timestamp
1443714889
DKIM signature
missing
Download raw message
On Thu, 1 Oct 2015 09:19:17 -0300
Marlus Saraiva <marlus.saraiva@gmail.com> wrote:

> 2015-09-30 9:40 GMT-03:00 Natanael Copa <ncopa@alpinelinux.org>:
> 
> > On Tue, 29 Sep 2015 00:51:43 +0000
> > Marlus Saraiva <marlus.saraiva@gmail.com> wrote:
> >
> > > ---
> > >  .../0006-Do-not-install-erlang-sources.patch       | 531
> > +++++++++++++++------
> > >  main/erlang/APKBUILD                               |  26 +-
> > >  2 files changed, 382 insertions(+), 175 deletions(-)
...                  ^
> > hipe/hipe_x86_signal.c:233:15: note: each undeclared identifier is
> > reported only once for each function it appears in
> >  #define _NSIG NSIG
> >                ^
> > hipe/hipe_x86_signal.c:341:21: note: in expansion of macro '_NSIG'
> >      for (i = 1; i < _NSIG; ++i) {
> >                      ^
> > x86_64-alpine-linux-musl/Makefile:956: recipe for target
> > 'obj/x86_64-alpine-linux-musl/opt/smp/hipe_x86_signal.o' failed
> >
> >
> This happened because you had m4 installed in your environment and I
> didn't. When m4 is found, hipe is enabled by default. If hipe is enabled,
> we need to apply an additional patch. I already have the patch working fine
> and will submit it among the other changes. My question is: should I add m4
> to "makedepends" or should I assume it's already installed in your
> environment before you build the packages?

it has been pushed already.

in this case we should probably have a --disable-hipe or
--disable-m4 or similar so it builds even with m4 installed.
Alternatively we could also add makedepends="!m4 ..." with a comment
explaining why m4 cannot be installed on build box.


thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)