ngspice: update to 35

Also fixes issue with ngspice binary not being packaged and include
warning for kicad.
This commit is contained in:
Mat Boehlke 2021-08-29 17:58:28 -05:00 committed by Érico Nogueira Rolim
parent 29dd36566b
commit c36b04c616
3 changed files with 36 additions and 20 deletions

View file

@ -3181,7 +3181,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 ngspice-35_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

View file

@ -1,15 +0,0 @@
libshlwapi is Windows-only
diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in
index b450e8c..2ea8716 100644
--- a/src/xspice/cmpp/Makefile.in
+++ b/src/xspice/cmpp/Makefile.in
@@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y
@CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES)
@CROSS_COMPILING_TRUE@ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
-@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ -lshlwapi
+@CROSS_COMPILING_TRUE@ $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^
@CROSS_COMPILING_TRUE@distclean-local:
@CROSS_COMPILING_TRUE@ -rm -rf build

View file

@ -1,19 +1,50 @@
# Template file for 'ngspice'
# WARNING: if the libngspice.so.x.y.z file changes name, revbump kicad
pkgname=ngspice
version=33
version=35
revision=1
build_style=gnu-configure
configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
configure_args="--enable-xspice --enable-cider"
hostmakedepends="bison byacc"
makedepends="readline-devel libX11-devel libXaw-devel"
checkdepends="perl"
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=c1b7f5c276db579acb3f0a7afb64afdeb4362289a6cab502d4ca302d6e5279ec
post_install() {
# ngshared binary and shared library can't be built in the same pass
# --ngshared builds the shared library, and readline should only be enabled for the binary
# see: https://github.com/imr/ngspice/commit/b86c85f85bbba6e45dc030af3e853edf8b9cfa3d
do_configure() {
mkdir build
cd build
../configure --with-readline=yes $configure_args
mkdir ../build-lib
cd ../build-lib
../configure --with-ngshared $configure_args
}
do_build() {
make -C build $makejobs
make -C build-lib $makejobs
}
# Starting with v34, some tests fail with "No compatability mode selected!"
# Solution is to add this line to a .spiceinit file in the home directory,
# see: https://sourceforge.net/p/ngspice/bugs/554/#b513
do_check() {
export HOME="${PWD}/.home_dir"
install -d "$HOME"
printf 'set ngbehavior=mc\n' > "${HOME}/.spiceinit"
make -C build check
}
do_install() {
make DESTDIR=${DESTDIR} -C build install
make DESTDIR=${DESTDIR} -C build-lib install
vlicense COPYING
}