New comment by unspecd on void-packages repository https://github.com/void-linux/void-packages/pull/27320#issuecomment-749830816 Comment: How can I merge this with 720f2c1c52da5b672944381616cc76b23c9ed9fa? `srcpkgs/guile/template` ```diff @@ -1,20 +1,28 @@ # Template file for 'guile' pkgname=guile version=2.2.7 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-static --disable-error-on-warning" +configure_args="--disable-static --disable-error-on-warning --program-suffix=2" hostmakedepends="pkg-config texinfo" makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel libunistring-devel readline-devel" -short_desc="A portable, embeddable Scheme implementation written in C" +short_desc="Portable, embeddable Scheme implementation written in C" maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-3.0-or-later" -homepage="http://www.gnu.org/software/${pkgname}" +homepage="http://www.gnu.org/software/guile" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007 subpackages="libguile guile-devel" +alternatives=" + guile:guile:/usr/bin/guile2 + guile:guild:/usr/bin/guild2 + guile:guile-config:/usr/bin/guile-config2 + guile:guile-snarf:/usr/bin/guile-snarf2 + guile:guile-tools:/usr/bin/guile-tools2 + guile:guile.1:/usr/share/man/man1/guile2.1" + if [ "$CROSS_BUILD" ]; then # Need host guile to cross compile hostmakedepends+=" guile" @@ -25,6 +33,14 @@ pre_configure() { case "$XBPS_TARGET_MACHINE" in ppc*) export CFLAGS+=" -Os";; esac + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test + fi +} + +post_install() { + # conflicts with guile-1.8, guile-3.0 + rm -rf ${DESTDIR}/usr/share/info } libguile_package() { @@ -40,10 +56,11 @@ guile-devel_package() { short_desc+=" - development files" depends="gmp-devel gc-devel guile>=${version}_${revision}" pkg_install() { - vmove usr/bin/guile-config + vmove usr/bin/guile-config2 vmove usr/include - vmove usr/share/aclocal vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove usr/share/aclocal + mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4} } } ```