aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2020-04-30 00:47:35 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-04-30 00:09:31 +0000
commit65a680b2993d80175e4f451de324f1602721db37 (patch)
treefd7e41a22364ec30e0bd9c49eda06182e5029f12 /main
parent6e692ffb6467368615abc54620ffb79747e1393f (diff)
downloadaports-65a680b2993d80175e4f451de324f1602721db37.tar.bz2
aports-65a680b2993d80175e4f451de324f1602721db37.tar.xz
main/slang: modernize
- Switch url and src to https - Add -static subpkg - Patch redundant rpath - Patch 32bit array issue
Diffstat (limited to 'main')
-rw-r--r--main/slang/APKBUILD27
-rw-r--r--main/slang/disable-rpath.patch25
-rw-r--r--main/slang/fix-slarray-32bit.patch19
3 files changed, 59 insertions, 12 deletions
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD
index cae08a4ce4..d7445ea8e8 100644
--- a/main/slang/APKBUILD
+++ b/main/slang/APKBUILD
@@ -3,17 +3,17 @@ pkgname=slang
pkgver=2.3.2
pkgrel=0
pkgdesc="Powerful interpreted language"
-url="http://www.jedsoft.org/slang"
+url="https://www.jedsoft.org/slang"
arch="all"
license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pcre-dev ncurses-dev"
-source="http://www.jedsoft.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2"
+makedepends="ncurses-dev pcre-dev"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2
+ disable-rpath.patch
+ fix-slarray-32bit.patch
+ "
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -21,13 +21,16 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
- make -j1 elf static
- cd slsh && make
+ make -j1
+}
+
+check() {
+ make check
}
package() {
- cd "$builddir"
- make -j1 install-all DESTDIR="$pkgdir"
+ make -j1 DESTDIR="$pkgdir" install-all
}
-sha512sums="35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5 slang-2.3.2.tar.bz2"
+6cc7ee4493131e2c9ec48db1b5f97c5db9288e96c5073507307454dd02437b9076ffe1a4853097a7912fa7f47e694145ac1e7f7b17a29e642a8866af521cd940 disable-rpath.patch
+3a4d7c27734b6d29ce029000275a536744f6127c9bcb9eee168a63666e9b134bf72d3a27e0b6cfb90b968420a7778284b7cf1f1871031f0240f6394392e0b66c fix-slarray-32bit.patch
diff --git a/main/slang/disable-rpath.patch b/main/slang/disable-rpath.patch
new file mode 100644
index 0000000000..a60e1178b0
--- /dev/null
+++ b/main/slang/disable-rpath.patch
@@ -0,0 +1,25 @@
+Upstream: no.
+Reason: >>> WARNING: slang*: Redundant /usr/lib in rpath found
+
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -89,7 +89,7 @@
+ # ---------------------------------------------------------------------------
+ RPATH = @RPATH@
+
+-LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
++LIBS = $(LDFLAGS) $(SLANG_LIB) $(DL_LIB) @M_LIB@
+ INCS = $(SLANG_SRCINC)
+ COMPILE_CMD = $(CC_SHARED) $(INCS)
+ # ---------------------------------------------------------------------------
+--- b/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -77,7 +77,7 @@
+ #----------------------------------------------------------------------------
+ @SET_MAKE@
+ SHELL = /bin/sh
+-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
++INST_LIBS = $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+ DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
+ -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
+ -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
diff --git a/main/slang/fix-slarray-32bit.patch b/main/slang/fix-slarray-32bit.patch
new file mode 100644
index 0000000000..b8189c5562
--- /dev/null
+++ b/main/slang/fix-slarray-32bit.patch
@@ -0,0 +1,19 @@
+Upstream: no idea. Patch from upstream mailing list.
+Reason: src/test/array.sl fails on 32bit archs:
+Testing array functions ...Unable to create a multi-dimensional array of the desired size
+./array.sl:166:<top-level>:Invalid Parameter
+URL: http://lists.jedsoft.org/lists/slang-users/2019/0000002.html
+
+--- a/src/slarray.c
++++ b/src/slarray.c
+@@ -369,7 +369,9 @@
+ SLindex_Type new_num_elements;
+ at->dims[i] = dims[i];
+ new_num_elements = dims[i] * num_elements;
+- if (dims[i] && (new_num_elements/dims[i] != num_elements))
++ if (dims[i]
++ && ((new_num_elements/dims[i] != num_elements)
++ || (new_num_elements < 0)))
+ {
+ throw_size_error (SL_Index_Error);
+ free_array (at);