diff options
Diffstat (limited to 'academic/arpack-ng/patches/pkgconfig.diff')
-rw-r--r-- | academic/arpack-ng/patches/pkgconfig.diff | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/academic/arpack-ng/patches/pkgconfig.diff b/academic/arpack-ng/patches/pkgconfig.diff new file mode 100644 index 0000000000..73a00eb23d --- /dev/null +++ b/academic/arpack-ng/patches/pkgconfig.diff @@ -0,0 +1,142 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -807,7 +807,7 @@ + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix \${prefix}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) +-set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) ++set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) + set(PACKAGE_NAME ${PROJECT_NAME}) + set(PACKAGE_VERSION ${arpack_ng_VERSION}) + set(PACKAGE_URL "https://github.com/opencollab/arpack-ng/") +@@ -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(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) + + install(TARGETS arpack + EXPORT arpackngTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +-install(FILES "${PROJECT_BINARY_DIR}/arpack${LIBSUFFIX}${ITF64SUFFIX}.pc" ++install(FILES "${PROJECT_BINARY_DIR}/SRC/arpack${LIBSUFFIX}${ITF64SUFFIX}.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if (MPI) +@@ -847,7 +847,7 @@ + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +- install(FILES "${PROJECT_BINARY_DIR}/parpack${LIBSUFFIX}${ITF64SUFFIX}.pc" ++ install(FILES "${PROJECT_BINARY_DIR}/PARPACK/SRC/MPI/parpack${LIBSUFFIX}${ITF64SUFFIX}.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif () + +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -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 +- +-# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file: +-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 +@@ -46,3 +46,8 @@ + libparpack@LIBSUFFIX@@ITF64SUFFIX@_la_LIBADD += $(top_builddir)/ICB/libdbgicb.la $(top_builddir)/ICB/libstaicb.la + libparpack@LIBSUFFIX@@ITF64SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir) + endif ++ ++pkgconfig_DATA = parpack@LIBSUFFIX@@ITF64SUFFIX@.pc ++ ++# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file: ++DISTCLEANFILES = parpack@LIBSUFFIX@@ITF64SUFFIX@.pc +diff --git a/pkg-config/parpack.pc.in b/PARPACK/SRC/MPI/parpack.pc.in +rename from pkg-config/parpack.pc.in +rename to PARPACK/SRC/MPI/parpack.pc.in +--- a/pkg-config/parpack.pc.in ++++ b/PARPACK/SRC/MPI/parpack.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@/arpack@ITF64SUFFIX@ ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Collection of Fortran77 subroutines designed to solve large scale eigenvalue problems +@@ -10,4 +10,4 @@ + Requires.private: arpack@LIBSUFFIX@@ITF64SUFFIX@ + Libs: -L${libdir} -lparpack@LIBSUFFIX@@ITF64SUFFIX@ + Libs.private: @PARPACK_PC_LIBS_PRIVATE@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/arpack@ITF64SUFFIX@ +diff --git a/SRC/Makefile.am b/SRC/Makefile.am +--- a/SRC/Makefile.am ++++ b/SRC/Makefile.am +@@ -33,3 +33,8 @@ + libarpack@LIBSUFFIX@@ITF64SUFFIX@_la_LIBADD += $(top_builddir)/ICB/libdbgicb.la $(top_builddir)/ICB/libstaicb.la + libarpack@LIBSUFFIX@@ITF64SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir) + endif ++ ++pkgconfig_DATA = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc ++ ++# Due to the LIBSUFFIX/ITF64SUFFIX, configure doesn't automatically clean this file: ++DISTCLEANFILES = arpack@LIBSUFFIX@@ITF64SUFFIX@.pc +diff --git a/pkg-config/arpack.pc.in b/SRC/arpack.pc.in +rename from pkg-config/arpack.pc.in +rename to SRC/arpack.pc.in +--- a/pkg-config/arpack.pc.in ++++ b/SRC/arpack.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@/arpack@ITF64SUFFIX@ ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Collection of Fortran77 subroutines designed to solve large scale eigenvalue problems +@@ -9,4 +9,4 @@ + URL: @PACKAGE_URL@ + Libs: -L${libdir} -larpack@LIBSUFFIX@@ITF64SUFFIX@ + Libs.private: @ARPACK_PC_LIBS_PRIVATE@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/arpack@ITF64SUFFIX@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -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 ++ SRC/arpack$LIBSUFFIX$ITF64SUFFIX.pc:SRC/arpack.pc.in ++ PARPACK/SRC/MPI/parpack$LIBSUFFIX$ITF64SUFFIX.pc:PARPACK/SRC/MPI/parpack.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 |