diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/erlang/APKBUILD | 19 | ||||
| -rw-r--r-- | user/erlang/fix-wx-linking.patch | 8 |
2 files changed, 12 insertions, 15 deletions
diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index e24353ac0..3c0e6ad73 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,24 +1,24 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.0 +pkgver=22.0.7 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" arch="all" license="Apache-2.0" depends="" -makedepends="flex libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl - unixodbc-dev" +makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-dev + openssl-dev perl unixodbc-dev" subpackages="$pkgname-dev" -source="http://erlang.org/download/otp_src_$pkgver.tar.gz +source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz fix-wx-linking.patch safe-signal-handling.patch " -builddir="$srcdir/otp_src_$pkgver" +builddir="$srcdir/otp-OTP-$pkgver" build() { - cd "$builddir" + ./otp_build autoconf ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,8 +34,6 @@ build() { check() { local _header - - cd "$builddir" export ERL_TOP=$builddir make release_tests @@ -50,10 +48,9 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3f98697b59b33910fa461141fc4fe9635c4b6a53900dd90920add709dc10468aad7b9fde12419f05b27e038aee5a254319b1c5dc0e26ceabf29a7eb8020b5d23 otp_src_22.0.tar.gz -5f1b05d8be71d5e3d7e8c5ad019329af8f68174251b5b6e0a9ee9cb3da51a10983b8696e23b3954c19de5d54783ec16f38c80c74724341dbafb22fcac83c77d4 fix-wx-linking.patch +sha512sums="cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 erlang-22.0.7.tar.gz +91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch index eb5649164..e1e8d4333 100644 --- a/user/erlang/fix-wx-linking.patch +++ b/user/erlang/fix-wx-linking.patch @@ -1,10 +1,10 @@ ---- otp_src_21.2/lib/wx/configure.old 2018-12-10 20:11:00.000000000 +0000 -+++ otp_src_21.2/lib/wx/configure 2019-02-24 22:16:37.340000000 +0000 -@@ -5765,7 +5765,7 @@ +--- otp-OTP-22.0.7/lib/wx/configure.in.old 2019-07-10 16:05:15.000000000 +0000 ++++ otp-OTP-22.0.7/lib/wx/configure.in 2019-08-07 01:00:20.532799505 +0000 +@@ -650,7 +650,7 @@ // it isn't in too old wxWidgets versions wxString test = wxString::FromUTF8((const char *)"foo"); wxStyledTextCtrl * foo = new wxStyledTextCtrl(); -- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, +- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, + wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL, wxDefaultPosition,wxDefaultSize,0); return true; |