[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages master
https://github.com/void-linux/void-packages/pull/24424
isl: update to 0.22.1
I edited the template, the corresponding soname and revbumped all involved.
It builds clean on my machine.
I'm not sure how to include vlicense() for MIT.
This is my first pull request, I hope I didn't mess anything up.
A patch file from https://github.com/void-linux/void-packages/pull/24424.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-24424.patch --]
[-- Type: text/x-diff, Size: 10101 bytes --]
From 26ca43a963d8748c07c26c9b2a52b08145877c9a Mon Sep 17 00:00:00 2001
From: Nicolo' Piazzalunga <nicolopiazzalunga@gmail.com>
Date: Sat, 22 Aug 2020 15:54:58 +0200
Subject: [PATCH 1/2] isl: update to 0.22.1.
---
common/shlibs | 2 +-
srcpkgs/isl/template | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 676eb94366b..8adba97f49e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1116,7 +1116,7 @@ libfltk_images.so.1.3 fltk-1.3.0_1
libspectre.so.1 libspectre-0.2.6_1
libsratom-0.so.0 sratom-0.4.0_1
libpwquality.so.1 libpwquality-1.1.1_1
-libisl.so.10 isl-0.10_1
+libisl.so.22 isl-0.22_1
libisl.so.19 isl15-0.19_1
libcloog-isl.so.4 cloog-0.18.1_1
librtmp.so.1 librtmp-2.4.20161210_1
diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 9a79dc216a1..55bf105a712 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,16 +1,17 @@
# Template file for 'isl'
pkgname=isl
-version=0.12.2
-revision=2
+version=0.22.1
+revision=1
+wrksrc="isl-${version}"
bootstrap=yes
build_style=gnu-configure
makedepends="gmp-devel"
short_desc="Integer Set Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://freecode.com/projects/isl"
-license="LGPL-2.1"
+license="MIT"
+homepage="http://isl.gforge.inria.fr"
distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
-checksum=f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
+checksum=1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd
if [ -z "$CHROOT_READY" ]; then
CFLAGS="-I${XBPS_MASTERDIR}/usr/include"
@@ -23,8 +24,9 @@ post_install() {
}
isl-devel_package() {
- depends="gmp-devel isl>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
+ conflicts="isl-devel>=0"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
From fc692624aae3502d0c2dcc5e318c305d35630f13 Mon Sep 17 00:00:00 2001
From: Nicolo' Piazzalunga <nicolopiazzalunga@gmail.com>
Date: Sat, 22 Aug 2020 20:13:13 +0200
Subject: [PATCH 2/2] added bumps
---
srcpkgs/avr-gcc/template | 2 +-
srcpkgs/cloog/template | 2 +-
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
srcpkgs/cross-arm-none-eabi-gcc/template | 2 +-
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
srcpkgs/cross-i686-linux-musl/template | 2 +-
srcpkgs/cross-mips-linux-musl/template | 2 +-
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index bf65e60bf13..604cd54e655 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,7 +1,7 @@
# Template file for 'avr-gcc'
pkgname=avr-gcc
version=9.3.0
-revision=1
+revision=2
wrksrc="gcc-$version"
short_desc="GNU C Compiler for AVR"
maintainer="allan <mail@may.mooo.com>"
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 13aa6cad577..047cb2d7d5c 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -1,7 +1,7 @@
# Template file for 'cloog'
pkgname=cloog
version=0.18.4
-revision=2
+revision=3
bootstrap=yes
build_style=gnu-configure
configure_args="--with-isl=system --with-gmp=system --with-gmp-exec-prefix=${XBPS_CROSS_BASE}"
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 8dba1d564ec..0ec44fad6f6 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for ARM64 LE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index fb7d294df48..5e6cab37675 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for ARMv5 TE target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 77fb27fe5db..563a561aa99 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-arm-none-eabi-gcc/template b/srcpkgs/cross-arm-none-eabi-gcc/template
index 3896f61322b..87e1650bd49 100644
--- a/srcpkgs/cross-arm-none-eabi-gcc/template
+++ b/srcpkgs/cross-arm-none-eabi-gcc/template
@@ -3,7 +3,7 @@ _triplet=arm-none-eabi
_pkgname=gcc
pkgname=cross-${_triplet}-gcc
version=9.3.0
-revision=1
+revision=2
wrksrc="gcc-${version}"
build_wrksrc=build
build_style=gnu-configure
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index b29d69de9b2..d6de57439e1 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index af40ec66455..3f0010c0fc3 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,7 +12,7 @@ _archflags="-march=i686"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for i686 target (musl)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index bc8b15ac541..84644f7a488 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 4f3bc67aa80..0d40b11ef83 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
maintainer="hipperson0 <hipperson0@gmail.com>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 48a0027d4eb..68d49ad6731 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index e639bf043d7..94e39986f1f 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=3
+revision=4
short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index fc7ca0cb7bf..1a3155ff982 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=2
+revision=3
short_desc="Cross toolchain for PowerPC (musl)"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 3d92c564e2b..fbdc6c74099 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=2
+revision=3
short_desc="Cross toolchain for powerpc64 with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 810bc01192d..ebe0941c92a 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.33
-revision=2
+revision=3
short_desc="Cross toolchain for powerpc64le with musl"
maintainer="q66 <daniel@octaforge.org>"
homepage="https://www.voidlinux.org/"