-
-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
15 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From a65817a4793e2c231349cc7d2ff90b9444a9aab2 Mon Sep 17 00:00:00 2001 | ||
| From 1abee10bed54f9e80f67f4f90dbe62a4415e5c4a Mon Sep 17 00:00:00 2001 | ||
| From: Frank Hunleth <[email protected]> | ||
| Date: Tue, 11 Sep 2018 12:32:11 -0400 | ||
| Subject: [PATCH] erlang: bump to 21.2.5 | ||
| Subject: [PATCH] erlang: bump to 21.2.6 | ||
|
|
||
| --- | ||
| ...truct-libatomic_ops-we-do-require-CA.patch | 70 ------------------- | ||
|
|
@@ -16,9 +16,9 @@ Subject: [PATCH] erlang: bump to 21.2.5 | |
| delete mode 100644 package/erlang/21.0/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| delete mode 100644 package/erlang/21.0/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| delete mode 100644 package/erlang/21.0/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| create mode 100644 package/erlang/21.2.5/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| create mode 100644 package/erlang/21.2.5/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| create mode 100644 package/erlang/21.2.5/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| create mode 100644 package/erlang/21.2.6/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| create mode 100644 package/erlang/21.2.6/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| create mode 100644 package/erlang/21.2.6/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
|
|
||
| diff --git a/package/erlang/21.0/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/21.0/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| deleted file mode 100644 | ||
|
|
@@ -196,11 +196,11 @@ index ad0bb6b453..0000000000 | |
| --- | ||
| -2.14.1 | ||
| - | ||
| diff --git a/package/erlang/21.2.5/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/21.2.5/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| diff --git a/package/erlang/21.2.6/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/21.2.6/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| new file mode 100644 | ||
| index 0000000000..8e401430fe | ||
| --- /dev/null | ||
| +++ b/package/erlang/21.2.5/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| +++ b/package/erlang/21.2.6/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch | ||
| @@ -0,0 +1,70 @@ | ||
| +From 439fa2eae78a8900bda120072335be19d626498c Mon Sep 17 00:00:00 2001 | ||
| +From: "Yann E. MORIN" <[email protected]> | ||
|
|
@@ -272,11 +272,11 @@ index 0000000000..8e401430fe | |
| +-- | ||
| +1.9.1 | ||
| + | ||
| diff --git a/package/erlang/21.2.5/0002-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/21.2.5/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| diff --git a/package/erlang/21.2.6/0002-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/21.2.6/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| new file mode 100644 | ||
| index 0000000000..7a6e469dff | ||
| --- /dev/null | ||
| +++ b/package/erlang/21.2.5/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| +++ b/package/erlang/21.2.6/0002-erts-emulator-reorder-inclued-headers-paths.patch | ||
| @@ -0,0 +1,46 @@ | ||
| +From 85a3e5b4f65e5284e59dcdd90e92ea7d50ef6907 Mon Sep 17 00:00:00 2001 | ||
| +From: Romain Naour <[email protected]> | ||
|
|
@@ -324,11 +324,11 @@ index 0000000000..7a6e469dff | |
| + | ||
| + $(OBJDIR)/%.o: $(TARGET)/%.c | ||
| + $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@ | ||
| diff --git a/package/erlang/21.2.5/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/package/erlang/21.2.5/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| diff --git a/package/erlang/21.2.6/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/package/erlang/21.2.6/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| new file mode 100644 | ||
| index 0000000000..ad0bb6b453 | ||
| --- /dev/null | ||
| +++ b/package/erlang/21.2.5/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| +++ b/package/erlang/21.2.6/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch | ||
| @@ -0,0 +1,42 @@ | ||
| +From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001 | ||
| +From: Johan Oudinet <[email protected]> | ||
|
|
@@ -373,25 +373,25 @@ index 0000000000..ad0bb6b453 | |
| +2.14.1 | ||
| + | ||
| diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash | ||
| index 0587c9df01..939d730e05 100644 | ||
| index 0587c9df01..ae9e41d3c5 100644 | ||
| --- a/package/erlang/erlang.hash | ||
| +++ b/package/erlang/erlang.hash | ||
| @@ -1,4 +1,4 @@ | ||
| # sha256 locally computed | ||
| -sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131 OTP-21.0.tar.gz | ||
| +sha256 3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165 OTP-21.2.5.tar.gz | ||
| +sha256 aa0b95031e7c01af8a7042a00974ab16ed8fec305a68d7dbaa4185e5d58ef4d5 OTP-21.2.6.tar.gz | ||
| sha256 a06d68aaf4884752d226410ff66547783c260bf4fc92147d60c4011465c1de24 OTP-20.3.8.5.tar.gz | ||
| sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt | ||
| diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk | ||
| index 2a373688f1..631d500e0d 100644 | ||
| index 2a373688f1..20d9f00d7d 100644 | ||
| --- a/package/erlang/erlang.mk | ||
| +++ b/package/erlang/erlang.mk | ||
| @@ -8,7 +8,7 @@ | ||
| ifeq ($(BR2_PACKAGE_ERLANG_20),y) | ||
| ERLANG_VERSION = 20.3.8.5 | ||
| else | ||
| -ERLANG_VERSION = 21.0 | ||
| +ERLANG_VERSION = 21.2.5 | ||
| +ERLANG_VERSION = 21.2.6 | ||
| endif | ||
|
|
||
| ERLANG_SITE = https://github.com/erlang/otp/archive | ||
|
|
||