academic/arpack-ng: Updated for version 3.9.1

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Kyle Guinn 2024-01-08 23:06:28 -06:00 committed by Willy Sudiarto Raharjo
parent ff3ecdf383
commit 281be31d00
No known key found for this signature in database
GPG key ID: 3F617144D7238786
3 changed files with 27 additions and 103 deletions

View file

@ -2,7 +2,7 @@
# Slackware build script for arpack-ng
# Copyright 2014-2023 Kyle Guinn <elyk03@gmail.com>
# Copyright 2014-2024 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=arpack-ng
VERSION=${VERSION:-3.9.0}
VERSION=${VERSION:-3.9.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -74,7 +74,7 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
patch -p1 < $CWD/patches/install-paths.diff
patch -p1 < $CWD/patches/pkgconfig.diff
patch -p1 < $CWD/patches/atlas-lib-rename.diff
./bootstrap

View file

@ -1,8 +1,8 @@
PRGNAM="arpack-ng"
VERSION="3.9.0"
VERSION="3.9.1"
HOMEPAGE="https://github.com/opencollab/arpack-ng"
DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.9.0/arpack-ng-3.9.0.tar.gz"
MD5SUM="e28fdbe33ee44a16e2733c180ec2a2bd"
DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.9.1/arpack-ng-3.9.1.tar.gz"
MD5SUM="8f66485ae9d7e676b42aeead2bf5757e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lapack"

View file

@ -1,16 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@
# 'make install' to the correct location, and also define
# paths for target_include_directories and target_link_libraries
include(GNUInstallDirs)
-set(ARPACK_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/arpack-ng${ITF64SUFFIX}")
+set(ARPACK_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/arpack${ITF64SUFFIX}")
set(ARPACK_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/arpackng${LIBSUFFIX}${ITF64SUFFIX}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -798,7 +798,7 @@
@@ -807,7 +807,7 @@
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix \${prefix})
set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
@ -19,20 +10,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
set(PACKAGE_NAME ${PROJECT_NAME})
set(PACKAGE_VERSION ${arpack_ng_VERSION})
set(PACKAGE_URL "https://github.com/opencollab/arpack-ng/")
@@ -821,9 +821,9 @@
@@ -830,15 +830,15 @@
endforeach()
string(REPLACE ";" " " PARPACK_PC_LIBS_PRIVATE "${PARPACK_PC_LIBS_PRIVATE}")
-configure_file(pkg-config/arpack.pc.in "${PROJECT_BINARY_DIR}/arpack${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
-configure_file(pkg-config/parpack.pc.in "${PROJECT_BINARY_DIR}/parpack${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
-configure_file(pkg-config/arpackSolver.pc.in "${PROJECT_BINARY_DIR}/arpackSolver${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
+configure_file(SRC/arpack.pc.in "${PROJECT_BINARY_DIR}/SRC/arpack${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
+configure_file(PARPACK/SRC/MPI/parpack.pc.in "${PROJECT_BINARY_DIR}/PARPACK/SRC/MPI/parpack${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
+configure_file(EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in "${PROJECT_BINARY_DIR}/EXAMPLES/MATRIX_MARKET/arpackSolver${LIBSUFFIX}${ITF64SUFFIX}.pc" @ONLY)
install(TARGETS arpack
@@ -831,7 +831,7 @@
EXPORT arpackngTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -41,7 +29,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
if (MPI)
@@ -840,7 +840,7 @@
@@ -847,7 +847,7 @@
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -50,92 +38,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif ()
@@ -853,7 +853,7 @@
endif()
if (ICBEXMM)
install(FILES EXAMPLES/MATRIX_MARKET/arpackSolver.hpp DESTINATION ${ARPACK_INSTALL_INCLUDEDIR})
- install(FILES "${PROJECT_BINARY_DIR}/arpackSolver${LIBSUFFIX}${ITF64SUFFIX}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES "${PROJECT_BINARY_DIR}/EXAMPLES/MATRIX_MARKET/arpackSolver${LIBSUFFIX}${ITF64SUFFIX}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
endif()
diff --git a/EXAMPLES/MATRIX_MARKET/Makefile.am b/EXAMPLES/MATRIX_MARKET/Makefile.am
--- a/EXAMPLES/MATRIX_MARKET/Makefile.am
+++ b/EXAMPLES/MATRIX_MARKET/Makefile.am
@@ -1,6 +1,8 @@
LDADD = $(top_builddir)/SRC/libarpack$(LIBSUFFIX)$(ITF64SUFFIX).la
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/ICB $(EIGEN3_CFLAGS)
+pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
+
EXTRA_DIST = README
check_PROGRAMS = arpackmm
@@ -12,6 +14,7 @@
if ICBEXMM
pkginclude_HEADERS = arpackSolver.hpp
+pkgconfig_DATA = arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
endif
CLEANFILES = \
@@ -20,3 +23,6 @@
arpackmm.v.out \
arpackSolver.resid.out \
arpackSolver.v.out
+
+# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file:
+DISTCLEANFILES = arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
diff --git a/pkg-config/arpackSolver.pc.in b/EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in
rename from pkg-config/arpackSolver.pc.in
rename to EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in
--- a/pkg-config/arpackSolver.pc.in
+++ b/EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in
@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-includedir=@includedir@/arpack-ng@ITF64SUFFIX@
+includedir=@includedir@
Name: arpackSolver
Description: Utility to test arpack with matrix market files
Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@
-Requires: arpack, eigen3 >= 3.3
-Cflags: -I${includedir}
+Requires: arpack@LIBSUFFIX@@ITF64SUFFIX@, eigen3 >= 3.3
+Cflags: -I${includedir}/arpack@ITF64SUFFIX@
diff --git a/ICB/Makefile.am b/ICB/Makefile.am
--- a/ICB/Makefile.am
+++ b/ICB/Makefile.am
@@ -1,5 +1,7 @@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
+
pkginclude_HEADERS = debug_c.h debug_c.hpp
pkginclude_HEADERS += stat_c.h stat_c.hpp
pkginclude_HEADERS += arpack.h arpack.hpp
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-pkgincludedir = $(includedir)/arpack-ng@ITF64SUFFIX@
+pkgincludedir = $(includedir)/arpack@ITF64SUFFIX@
pkginclude_HEADERS = debug.h stat.h debugF90.h statF90.h arpackdef.h
AM_DISTCHECK_CONFIGURE_FLAGS =
@@ -26,8 +26,3 @@
EXTRA_DIST = README.md PARPACK_CHANGES CHANGES DOCUMENTS VISUAL_STUDIO \
detect_arpack_bug.m4 CMakeLists.txt
-
-pkgconfig_DATA = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
-pkgconfig_DATA = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc
-
-# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file:
-DISTCLEANFILES = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc arpackSolver@LIBSUFFIX@@ITF64SUFFIX@.pc
-DISTCLEANFILES = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc parpack@LIBSUFFIX@@ITF64SUFFIX@.pc
diff --git a/PARPACK/SRC/MPI/Makefile.am b/PARPACK/SRC/MPI/Makefile.am
--- a/PARPACK/SRC/MPI/Makefile.am
+++ b/PARPACK/SRC/MPI/Makefile.am
@ -157,7 +71,7 @@ rename to PARPACK/SRC/MPI/parpack.pc.in
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/arpack-ng@ITF64SUFFIX@
-includedir=@includedir@/arpack@ITF64SUFFIX@
+includedir=@includedir@
Name: @PACKAGE_NAME@
@ -189,7 +103,7 @@ rename to SRC/arpack.pc.in
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/arpack-ng@ITF64SUFFIX@
-includedir=@includedir@/arpack@ITF64SUFFIX@
+includedir=@includedir@
Name: @PACKAGE_NAME@
@ -203,16 +117,26 @@ rename to SRC/arpack.pc.in
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -347,9 +347,9 @@
@@ -347,14 +347,12 @@
AC_SUBST([PARPACK_PC_LIBS_PRIVATE], ["$LAPACK_LIBS $BLAS_LIBS $MPI_Fortran_LIBS"])
AC_CONFIG_FILES([
- arpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpack.pc.in
- parpack$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/parpack.pc.in
- arpackSolver$LIBSUFFIX$ITF64SUFFIX.pc:pkg-config/arpackSolver.pc.in
+ SRC/arpack$LIBSUFFIX$ITF64SUFFIX.pc:SRC/arpack.pc.in
+ PARPACK/SRC/MPI/parpack$LIBSUFFIX$ITF64SUFFIX.pc:PARPACK/SRC/MPI/parpack.pc.in
+ EXAMPLES/MATRIX_MARKET/arpackSolver$LIBSUFFIX$ITF64SUFFIX.pc:EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in
], [], [LIBSUFFIX="$LIBSUFFIX"; ITF64SUFFIX="$ITF64SUFFIX"])
dnl We do NOT want arpackng*.cmake files to be created: @MPI@ can not be replaced.
-AC_CONFIG_FILES([
- tstAutotoolsInstall.sh:pkg-config/tstAutotoolsInstall.sh.in
-], [], [abs_top_builddir="$abs_top_builddir"])
+AC_CONFIG_FILES([tstAutotoolsInstall.sh], [chmod +x tstAutotoolsInstall.sh], [abs_top_builddir="$abs_top_builddir"])
AC_CONFIG_FILES([
arpackdef.h
diff --git a/pkg-config/tstAutotoolsInstall.sh.in b/tstAutotoolsInstall.sh.in
old mode 100755
new mode 100644
rename from pkg-config/tstAutotoolsInstall.sh.in
rename to tstAutotoolsInstall.sh.in