Skip to content

Commit

Permalink
ngspice: update to 34
Browse files Browse the repository at this point in the history
Also fixes issue with ngspice binary not being packaged.
Library is now moved to subpackage libngspice.
  • Loading branch information
mtboehlke committed Aug 7, 2021
1 parent a32011c commit 9ab3278
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 20 deletions.
2 changes: 1 addition & 1 deletion common/shlibs
Expand Up @@ -3202,7 +3202,7 @@ libgloox.so.17 gloox-1.0.20_1
libgsmsd.so.8 gammu-smsd-1.39.0_1
libGammu.so.8 gammu-1.39.0_1
libz3.so z3-4.6.0_2
libngspice.so.0 ngspice-27_2
libngspice.so.0 libngspice-34_1
libvulkan.so.1 vulkan-loader-1.0.57.0_1
libembb_mtapi_cpp.so embb-1.0.0_3
libembb_mtapi_c.so embb-1.0.0_3
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/libngspice
15 changes: 0 additions & 15 deletions srcpkgs/ngspice/patches/windows-only.patch

This file was deleted.

42 changes: 38 additions & 4 deletions srcpkgs/ngspice/template
@@ -1,28 +1,62 @@
# Template file for 'ngspice'
pkgname=ngspice
version=33
version=34
revision=1
build_style=gnu-configure
configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
configure_args="--with-ngshared --enable-xspice --enable-cider"
hostmakedepends="bison byacc"
makedepends="readline-devel libX11-devel libXaw-devel"
short_desc="Mixed Mode Mixed Level Circuit Simulator based on Spice3F5"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://ngspice.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
checksum=2263fffc6694754972af7072ef01cfe62ac790800dad651bc290bfcae79bd7b5

# Configure can only handle building ngspice as a library or as a binary, but not both,
# so essentially we have to build ngspice twice
pre_configure() {
install -d .build_bins
cp -fpr * .build_bins/
}

# --with-ngshared builds the library, but not binary, so remove flag for the second pass.
# readline should not be configured for the library, but include it here,
# see: https://github.com/imr/ngspice/commit/b86c85f85bbba6e45dc030af3e853edf8b9cfa3d
post_configure() {
cd .build_bins
configure_args="--with-readline=yes $(printf %s\\n "$configure_args" | sed 's/--with-ngshared//')" do_configure
}

post_build() {
cd .build_bins
do_build
}

post_install() {
vlicense COPYING
cd .build_bins
do_install
# cmpp is not distributed in v34, so don't include man page
rm -f "${DESTDIR}/usr/share/man/man1/cmpp.1"
# config.h is an internal header file, so don't include
# this will probably be fixed in v35
rm -f "${DESTDIR}/usr/include/config.h"
}

ngspice-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
depends="libngspice>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}

libngspice_package() {
short_desc+=" - library"
pkg_install() {
vmove "usr/lib/libngspice.so.*"
}
}

0 comments on commit 9ab3278

Please sign in to comment.