From e4450bb769287be345b4ab831aee1102f537286e Mon Sep 17 00:00:00 2001 From: Honza Macháček Date: Sat, 1 Sep 2012 11:32:43 +0200 Subject: Patches for sci-libs/bigdft to install GPU support corrected not to break linking against the compiled libraries --- sci-libs/bigdft/ChangeLog | 11 ++ sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild | 130 ------------- sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild | 130 +++++++++++++ .../bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch | 26 +++ .../bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch | 47 ----- .../files/bigdft-1.6-tuto.1-bigdft.pc-1.patch | 207 +++++++++++++++++++++ .../bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch | 203 -------------------- 7 files changed, 374 insertions(+), 380 deletions(-) delete mode 100644 sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild create mode 100644 sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild create mode 100644 sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch delete mode 100644 sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch create mode 100644 sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch delete mode 100644 sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog index dad986751..1f24f098c 100644 --- a/sci-libs/bigdft/ChangeLog +++ b/sci-libs/bigdft/ChangeLog @@ -4,6 +4,17 @@ <<<<<<< HEAD +*bigdft-1.6_pre1-r4 (01 Sep 2012) + + 01 Sep 2012; Honza Macháček + -bigdft-1.6_pre1-r3.ebuild, +bigdft-1.6_pre1-r4.ebuild, + -files/bigdft-1.6-tuto.1-GPUlibs.patch, + +files/bigdft-1.6-tuto.1-GPUlibs-1.patch, + -files/bigdft-1.6-tuto.1-bigdft.pc.patch, + +files/bigdft-1.6-tuto.1-bigdft.pc-1.patch: + Patches to install GPU support corrected not to break linking against the + compiled libraries + 10 Jul 2012; Honza Macháček files/bigdft-1.6-tuto.1-GPUlibs.patch: bigdft-1.6-tuto.1-GPUlibs.patch updated not to forget the pkg-config file diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild deleted file mode 100644 index a2cef02de..000000000 --- a/sci-libs/bigdft/bigdft-1.6_pre1-r3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs - -REAL_P="${P/_pre/-tuto.}" -REAL_P="${REAL_P/-tuto.0/-tuto}" - -DESCRIPTION="A DFT electronic structure code using a wavelet basis set" -HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" -SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="cuda doc etsf_io mpi netcdf opencl test" - -RDEPEND=" - =sci-libs/libxc-1*[fortran] - virtual/blas - virtual/fortran - virtual/lapack - mpi? ( virtual/mpi ) - cuda? ( dev-util/nvidia-cuda-sdk ) - opencl? ( - || ( - dev-util/nvidia-cuda-sdk - dev-util/amdstream - ) - ) - etsf_io? ( sci-libs/etsf_io ) - netcdf? ( || ( - sci-libs/netcdf[fortran] - sci-libs/netcdf-fortran - ) - )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/autoconf-2.59 - doc? ( virtual/latex-base )" - -S="${WORKDIR}/${REAL_P}" - -DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) - -FORTRAN_STANDARD=90 - -pkg_setup() { - # fortran-2.eclass does not handle mpi wrappers - if use mpi; then - export FC="mpif90" - export F77="mpif77" - export CC="mpicc" - else - tc-export FC F77 CC - fi - - fortran-2_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ - "${FILESDIR}"/"${REAL_P}"-bigdft.pc.patch \ - "${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \ - "${FILESDIR}"/"${REAL_P}"-GPUlibs.patch - sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die - sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die - eautoreconf -} - -src_configure() { - local modules="${EPREFIX}/usr/$(get_libdir)/finclude" - local netcdff_libs="-lnetcdff" - filter-flags '-m*' '-O*' "-pipe" - local nvcflags="${CFLAGS}" -# _filter-var nvcflags '-m*' '-O*' "-pipe" - local myeconfargs=( - $(use_enable mpi) - --enable-optimised-convolution - --enable-pseudo - --enable-libbigdft - --enable-binaries - --disable-minima-hopping - --with-moduledir="${modules}" - --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ - $(pkg-config --libs-only-l blas)" - --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ - $(pkg-config --libs-only-L blas)" - --enable-libxc - --disable-internal-libxc - --with-libxc-path="/usr" - --with-libxc-include="${modules}" - $(use_enable cuda cuda-gpu) - $(use_with cuda cuda-path /opt/cuda) - $(use_with cuda nvcc-flags "${nvcflags}") - $(use_enable opencl) - $(use_with opencl ocl-path "${EPREFIX}/usr") - $(use_with etsf_io etsf-io) - $(use_with etsf_io etsf-io-path "${EPREFIX}/usr") - $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") - "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" - FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" - LD="$(tc-getLD)" - CPP="$(tc-getCPP)" - ) - autotools-utils_src_configure -} - -src_compile() { - #autotools-utils_src_compile() expanded - _check_build_dir - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - emake -j1 - sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc - popd > /dev/null - - use doc && autotools-utils_src_compile doc -} - -src_test() { - use test && autotools-utils_src_test -} - -src_install() { - autotools-utils_src_install HAVE_LIBXC=1 -} diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild new file mode 100644 index 000000000..95bbebf41 --- /dev/null +++ b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs + +REAL_P="${P/_pre/-tuto.}" +REAL_P="${REAL_P/-tuto.0/-tuto}" + +DESCRIPTION="A DFT electronic structure code using a wavelet basis set" +HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/" +SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="cuda doc etsf_io mpi netcdf opencl test" + +RDEPEND=" + =sci-libs/libxc-1*[fortran] + virtual/blas + virtual/fortran + virtual/lapack + mpi? ( virtual/mpi ) + cuda? ( dev-util/nvidia-cuda-sdk ) + opencl? ( + || ( + dev-util/nvidia-cuda-sdk + dev-util/amdstream + ) + ) + etsf_io? ( sci-libs/etsf_io ) + netcdf? ( || ( + sci-libs/netcdf[fortran] + sci-libs/netcdf-fortran + ) + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/autoconf-2.59 + doc? ( virtual/latex-base )" + +S="${WORKDIR}/${REAL_P}" + +DOCS=( README INSTALL ChangeLog AUTHORS NEWS ) + +FORTRAN_STANDARD=90 + +pkg_setup() { + # fortran-2.eclass does not handle mpi wrappers + if use mpi; then + export FC="mpif90" + export F77="mpif77" + export CC="mpicc" + else + tc-export FC F77 CC + fi + + fortran-2_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \ + "${FILESDIR}"/"${REAL_P}"-bigdft.pc-1.patch \ + "${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \ + "${FILESDIR}"/"${REAL_P}"-GPUlibs-1.patch + sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die + sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die + eautoreconf +} + +src_configure() { + local modules="${EPREFIX}/usr/$(get_libdir)/finclude" + local netcdff_libs="-lnetcdff" + filter-flags '-m*' '-O*' "-pipe" + local nvcflags="${CFLAGS}" +# _filter-var nvcflags '-m*' '-O*' "-pipe" + local myeconfargs=( + $(use_enable mpi) + --enable-optimised-convolution + --enable-pseudo + --enable-libbigdft + --enable-binaries + --disable-minima-hopping + --with-moduledir="${modules}" + --with-ext-linalg="$(pkg-config --libs-only-l lapack) \ + $(pkg-config --libs-only-l blas)" + --with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \ + $(pkg-config --libs-only-L blas)" + --enable-libxc + --disable-internal-libxc + --with-libxc-path="/usr" + --with-libxc-include="${modules}" + $(use_enable cuda cuda-gpu) + $(use_with cuda cuda-path /opt/cuda) + $(use_with cuda nvcc-flags "${nvcflags}") + $(use_enable opencl) + $(use_with opencl ocl-path "${EPREFIX}/usr") + $(use_with etsf_io etsf-io) + $(use_with etsf_io etsf-io-path "${EPREFIX}/usr") + $(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)") + "$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" + FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}" + LD="$(tc-getLD)" + CPP="$(tc-getCPP)" + ) + autotools-utils_src_configure +} + +src_compile() { + #autotools-utils_src_compile() expanded + _check_build_dir + pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null + emake -j1 + sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc + popd > /dev/null + + use doc && autotools-utils_src_compile doc +} + +src_test() { + use test && autotools-utils_src_test +} + +src_install() { + autotools-utils_src_install HAVE_LIBXC=1 +} diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch new file mode 100644 index 000000000..386e39dc7 --- /dev/null +++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs-1.patch @@ -0,0 +1,26 @@ +diff -Naur orig/bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am patched/bigdft-1.6-tuto.1/src/CUDA/Makefile.am +--- bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am 2011-09-27 12:43:06.000000000 +0000 ++++ bigdft-1.6-tuto.1/src/CUDA/Makefile.am 2012-07-04 12:08:27.000000000 +0000 +@@ -43,7 +43,8 @@ + # Not used anymore, to be removed + #INC_CUDA = -I@LIB_CUTIL_PATH@ + EXTRA_PROGRAMS = conv_check +-noinst_LIBRARIES = libGPU.a libbasef.a ++lib_LIBRARIES = libGPU.a ++noinst_LIBRARIES = libbasef.a + + libGPU_a_SOURCES = $(SOURCES_CU_CONV1) $(SOURCES_SHARED) $(SOURCES_CONV) + AM_CPPFLAGS = $(INC_CUDA) -I. -I$(top_builddir) -I@CUDA_PATH@/include/ @LIBSGPU_INCLUDE@ -DCUBLAS_USE_THUNKING +diff -Naur orig/bigdft-1.6-tuto.1.orig/src/OpenCL/Makefile.am patched/bigdft-1.6-tuto.1/src/OpenCL/Makefile.am +--- bigdft-1.6-tuto.1.orig/src/OpenCL/Makefile.am 2011-09-27 12:43:06.000000000 +0000 ++++ bigdft-1.6-tuto.1/src/OpenCL/Makefile.am 2012-07-04 12:09:02.000000000 +0000 +@@ -26,7 +26,8 @@ + + EXTRA_PROGRAMS = conv_check conv_check_fft bench_conv bench_conv_quick bench_zgemm stream_check + +-noinst_LIBRARIES = libbasef.a libbasec.a libOCL.a libStream.a ++lib_LIBRARIES = libOCL.a ++noinst_LIBRARIES = libbasef.a libbasec.a libStream.a + + libbasef_a_SOURCES = $(mpi_source) + libbasef_a_LIBADD = ../modules/defs.o ../modules/base.o \ diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch deleted file mode 100644 index 507966518..000000000 --- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-GPUlibs.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur orig/bigdft-1.6-tuto.1.orig/configure.ac patched/bigdft-1.6-tuto.1/configure.ac ---- bigdft-1.6-tuto.1.orig/configure.ac 2012-07-10 08:50:27.000000000 +0000 -+++ bigdft-1.6-tuto.1/configure.ac 2012-07-10 09:03:46.303491671 +0000 -@@ -295,7 +295,7 @@ if test x"$ac_use_cuda_gpu" = "xyes" ; t - fi - fi - AC_SUBST(NVCC_FLAGS) -- LIBCUDA_LIBS="-L$ac_cuda_lib_path -lcudart -lcublas" -+ LIBCUDA_LIBS="-L$ac_cuda_lib_path -lGPU -lcudart -lcublas" - fi - - dnl Use the OpenCL support -@@ -332,7 +332,7 @@ if test x"$ac_use_ocl" = "xyes" ; then - ac_use_ocl="no" - else - dnl LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm -lrt -lstdc++" -- LIBOCL_LIBS="-L$ac_ocl_path/lib -lOpenCL -lm" -+ LIBOCL_LIBS="-L$ac_ocl_path/lib -lOCL -lOpenCL -lm" - fi - LIBS=$LIBS_OLD - fi -diff -Naur orig/bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am patched/bigdft-1.6-tuto.1/src/CUDA/Makefile.am ---- bigdft-1.6-tuto.1.orig/src/CUDA/Makefile.am 2011-09-27 12:43:06.000000000 +0000 -+++ bigdft-1.6-tuto.1/src/CUDA/Makefile.am 2012-07-04 12:08:27.000000000 +0000 -@@ -43,7 +43,8 @@ - # Not used anymore, to be removed - #INC_CUDA = -I@LIB_CUTIL_PATH@ - EXTRA_PROGRAMS = conv_check --noinst_LIBRARIES = libGPU.a libbasef.a -+lib_LIBRARIES = libGPU.a -+noinst_LIBRARIES = libbasef.a - - libGPU_a_SOURCES = $(SOURCES_CU_CONV1) $(SOURCES_SHARED) $(SOURCES_CONV) - AM_CPPFLAGS = $(INC_CUDA) -I. -I$(top_builddir) -I@CUDA_PATH@/include/ @LIBSGPU_INCLUDE@ -DCUBLAS_USE_THUNKING -diff -Naur orig/bigdft-1.6-tuto.1.orig/src/OpenCL/Makefile.am patched/bigdft-1.6-tuto.1/src/OpenCL/Makefile.am ---- bigdft-1.6-tuto.1.orig/src/OpenCL/Makefile.am 2011-09-27 12:43:06.000000000 +0000 -+++ bigdft-1.6-tuto.1/src/OpenCL/Makefile.am 2012-07-04 12:09:02.000000000 +0000 -@@ -26,7 +26,8 @@ - - EXTRA_PROGRAMS = conv_check conv_check_fft bench_conv bench_conv_quick bench_zgemm stream_check - --noinst_LIBRARIES = libbasef.a libbasec.a libOCL.a libStream.a -+lib_LIBRARIES = libOCL.a -+noinst_LIBRARIES = libbasef.a libbasec.a libStream.a - - libbasef_a_SOURCES = $(mpi_source) - libbasef_a_LIBADD = ../modules/defs.o ../modules/base.o \ diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch new file mode 100644 index 000000000..7c3380a9b --- /dev/null +++ b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc-1.patch @@ -0,0 +1,207 @@ +diff -Naur bigdft-1.6-tuto_orig/Makefile.am bigdft-1.6-tuto/Makefile.am +--- Makefile.am 2011-10-18 07:39:52.000000000 +0000 ++++ Makefile.am 2012-03-21 10:08:44.000000000 +0000 +@@ -4,7 +4,10 @@ + + ACLOCAL_AMFLAGS = -I config/m4 + +-DISTCLEANFILES = config.inc ++DISTCLEANFILES = config.inc bigdft.pc ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = bigdft.pc + + if BUILD_LIBABINIT + libABINIT_dir = libABINIT/src +diff -Naur bigdft-1.6-tuto_orig/Makefile.in bigdft-1.6-tuto/Makefile.in +--- Makefile.in 2012-03-21 10:03:28.000000000 +0000 ++++ Makefile.in 2012-03-21 10:20:48.000000000 +0000 +@@ -33,7 +33,7 @@ + POST_UNINSTALL = : + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(srcdir)/Makefile.in $(srcdir)/bigdft.pc.in $(srcdir)/config.h.in \ + $(top_srcdir)/config/Doxyfile.in $(top_srcdir)/configure \ + AUTHORS COPYING ChangeLog INSTALL NEWS config/depcomp \ + config/install-sh config/missing +@@ -48,7 +48,7 @@ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = config/Doxyfile ++CONFIG_CLEAN_FILES = bigdft.pc config/Doxyfile + CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = +@@ -59,6 +59,35 @@ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } ++am__installdirs = "$(DESTDIR)$(pkgconfigdir)" ++DATA = $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +@@ -232,7 +261,9 @@ + config/m4 + + ACLOCAL_AMFLAGS = -I config/m4 +-DISTCLEANFILES = config.inc ++DISTCLEANFILES = config.inc bigdft.pc ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = bigdft.pc + @BUILD_LIBABINIT_FALSE@libABINIT_dir = + @BUILD_LIBABINIT_TRUE@libABINIT_dir = libABINIT/src + @BUILD_LIBXC_FALSE@libXC_dir = +@@ -307,8 +338,28 @@ + + distclean-hdr: + -rm -f config.h stamp-h1 ++bigdft.pc: $(top_builddir)/config.status $(srcdir)/bigdft.pc.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ + config/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/config/Doxyfile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ ++install-pkgconfigDATA: $(pkgconfig_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ ++ done ++ ++uninstall-pkgconfigDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -622,9 +673,12 @@ + exit 1; } >&2 + check-am: all-am + check: check-recursive +-all-am: Makefile config.h ++all-am: Makefile $(DATA) config.h + installdirs: installdirs-recursive + installdirs-am: ++ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -672,7 +726,7 @@ + + info-am: + +-install-data-am: ++install-data-am: install-pkgconfigDATA + + install-dvi: install-dvi-recursive + +@@ -718,7 +772,7 @@ + + ps-am: + +-uninstall-am: ++uninstall-am: uninstall-pkgconfigDATA + + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive +@@ -733,10 +787,10 @@ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ ++ install-pkgconfigDATA install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am uninstall-pkgconfigDATA + + configure + +diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in +--- bigdft.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ bigdft.pc.in 2012-02-01 09:43:59.000000000 +0000 +@@ -0,0 +1,15 @@ ++@USE_CUDA_GPU_FALSE@libs_cuda= ++@USE_CUDA_GPU_TRUE@libs_cuda=$(top_builddir)/src/CUDA/libGPU.a ++@USE_OCL_FALSE@libs_ocl= ++@USE_OCL_TRUE@libs_ocl=$(top_builddir)/src/OpenCL/libOCL.a -lstdc++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libbigdft ++Description: Library for DFT calculation over wavelets. ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lbigdft -lpoissonsolver ${libs_cuda} ${libs_ocl} @LIBS@ @FCLIBS@ ++Cflags: -I${includedir} +diff -Naur bigdft-1.6-tuto_orig/configure bigdft-1.6-tuto/configure +--- configure 2012-03-21 10:03:26.000000000 +0000 ++++ configure 2012-03-21 11:04:52.000000000 +0000 +@@ -8512,7 +8512,7 @@ + docdir="${docdir}" + + +-ac_config_files="$ac_config_files Makefile libABINIT/src/Makefile config/Doxyfile src/Makefile src/modules/Makefile src/modules/configure.inc src/profiling/Makefile src/PSolver/Makefile src/convolutions/Makefile src/CUDA/Makefile src/OpenCL/Makefile src/dgemmsy/Makefile src/convolutions-c/Makefile src/art/Makefile src/tools/Makefile src/tools/bader/Makefile utils/Makefile utils/PSPfiles/Makefile pseudo/Makefile pseudo/src/Makefile pseudo/tests/Makefile doc/Makefile tests/Makefile tests/fft/Makefile tests/PSolver/Makefile tests/H2-freq/Makefile tests/MINHOP/Makefile tests/NEB/Makefile tests/NEB/input tests/NEB/NEB_include.sh tests/XabsCheb/Makefile tests/SPLSAD/Makefile tests/TDDFT/Makefile tests/OP2P/Makefile tests/DFT/Makefile tests/OpenCL/Makefile tests/CUDA/Makefile tests/ETSF_IO/Makefile tests/tutorials/Makefile tests/xc/Makefile" ++ac_config_files="$ac_config_files Makefile bigdft.pc libABINIT/src/Makefile config/Doxyfile src/Makefile src/modules/Makefile src/modules/configure.inc src/profiling/Makefile src/PSolver/Makefile src/convolutions/Makefile src/CUDA/Makefile src/OpenCL/Makefile src/dgemmsy/Makefile src/convolutions-c/Makefile src/art/Makefile src/tools/Makefile src/tools/bader/Makefile utils/Makefile utils/PSPfiles/Makefile pseudo/Makefile pseudo/src/Makefile pseudo/tests/Makefile doc/Makefile tests/Makefile tests/fft/Makefile tests/PSolver/Makefile tests/H2-freq/Makefile tests/MINHOP/Makefile tests/NEB/Makefile tests/NEB/input tests/NEB/NEB_include.sh tests/XabsCheb/Makefile tests/SPLSAD/Makefile tests/TDDFT/Makefile tests/OP2P/Makefile tests/DFT/Makefile tests/OpenCL/Makefile tests/CUDA/Makefile tests/ETSF_IO/Makefile tests/tutorials/Makefile tests/xc/Makefile" + + + # Call libXC ./configure script recursively. +@@ -9349,6 +9349,7 @@ + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "bigdft.pc") CONFIG_FILES="$CONFIG_FILES bigdft.pc" ;; + "libABINIT/src/Makefile") CONFIG_FILES="$CONFIG_FILES libABINIT/src/Makefile" ;; + "config/Doxyfile") CONFIG_FILES="$CONFIG_FILES config/Doxyfile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; +diff -Naur bigdft-1.6-tuto_orig/configure.ac bigdft-1.6-tuto/configure.ac +--- configure.ac 2012-03-21 10:03:02.000000000 +0000 ++++ configure.ac 2012-03-21 10:48:53.000000000 +0000 +@@ -715,6 +715,7 @@ + dnl Give the name of file.in to transform to file + AC_CONFIG_FILES([ + Makefile ++bigdft.pc + libABINIT/src/Makefile + config/Doxyfile + src/Makefile diff --git a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch b/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch deleted file mode 100644 index 3ddde7014..000000000 --- a/sci-libs/bigdft/files/bigdft-1.6-tuto.1-bigdft.pc.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -Naur bigdft-1.6-tuto_orig/Makefile.am bigdft-1.6-tuto/Makefile.am ---- Makefile.am 2011-10-18 07:39:52.000000000 +0000 -+++ Makefile.am 2012-03-21 10:08:44.000000000 +0000 -@@ -4,7 +4,10 @@ - - ACLOCAL_AMFLAGS = -I config/m4 - --DISTCLEANFILES = config.inc -+DISTCLEANFILES = config.inc bigdft.pc -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = bigdft.pc - - if BUILD_LIBABINIT - libABINIT_dir = libABINIT/src -diff -Naur bigdft-1.6-tuto_orig/Makefile.in bigdft-1.6-tuto/Makefile.in ---- Makefile.in 2012-03-21 10:03:28.000000000 +0000 -+++ Makefile.in 2012-03-21 10:20:48.000000000 +0000 -@@ -33,7 +33,7 @@ - POST_UNINSTALL = : - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -+ $(srcdir)/Makefile.in $(srcdir)/bigdft.pc.in $(srcdir)/config.h.in \ - $(top_srcdir)/config/Doxyfile.in $(top_srcdir)/configure \ - AUTHORS COPYING ChangeLog INSTALL NEWS config/depcomp \ - config/install-sh config/missing -@@ -48,7 +48,7 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = config/Doxyfile -+CONFIG_CLEAN_FILES = bigdft.pc config/Doxyfile - CONFIG_CLEAN_VPATH_FILES = - SOURCES = - DIST_SOURCES = -@@ -59,6 +59,35 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } -+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -+DATA = $(pkgconfig_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -232,7 +261,9 @@ - config/m4 - - ACLOCAL_AMFLAGS = -I config/m4 --DISTCLEANFILES = config.inc -+DISTCLEANFILES = config.inc bigdft.pc -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = bigdft.pc - @BUILD_LIBABINIT_FALSE@libABINIT_dir = - @BUILD_LIBABINIT_TRUE@libABINIT_dir = libABINIT/src - @BUILD_LIBXC_FALSE@libXC_dir = -@@ -307,8 +338,28 @@ - - distclean-hdr: - -rm -f config.h stamp-h1 -+bigdft.pc: $(top_builddir)/config.status $(srcdir)/bigdft.pc.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ - config/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/config/Doxyfile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ @$(NORMAL_INSTALL) -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ -+ done -+ -+uninstall-pkgconfigDATA: -+ @$(NORMAL_UNINSTALL) -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. -@@ -622,9 +673,12 @@ - exit 1; } >&2 - check-am: all-am - check: check-recursive --all-am: Makefile config.h -+all-am: Makefile $(DATA) config.h - installdirs: installdirs-recursive - installdirs-am: -+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -672,7 +726,7 @@ - - info-am: - --install-data-am: -+install-data-am: install-pkgconfigDATA - - install-dvi: install-dvi-recursive - -@@ -718,7 +772,7 @@ - - ps-am: - --uninstall-am: -+uninstall-am: uninstall-pkgconfigDATA - - .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive -@@ -733,10 +787,10 @@ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -+ install-pkgconfigDATA install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ -- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am -+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am uninstall-pkgconfigDATA - - configure - -diff -Naur bigdft-1.6-tuto_orig/bigdft.pc.in bigdft-1.6-tuto/bigdft.pc.in ---- bigdft.pc.in 1970-01-01 00:00:00.000000000 +0000 -+++ bigdft.pc.in 2012-02-01 09:43:59.000000000 +0000 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libbigdft -+Description: Library for DFT calculation over wavelets. -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lbigdft -lpoissonsolver @LIBS@ @FCLIBS@ -+Cflags: -I${includedir} -diff -Naur bigdft-1.6-tuto_orig/configure bigdft-1.6-tuto/configure ---- configure 2012-03-21 10:03:26.000000000 +0000 -+++ configure 2012-03-21 11:04:52.000000000 +0000 -@@ -8512,7 +8512,7 @@ - docdir="${docdir}" - - --ac_config_files="$ac_config_files Makefile libABINIT/src/Makefile config/Doxyfile src/Makefile src/modules/Makefile src/modules/configure.inc src/profiling/Makefile src/PSolver/Makefile src/convolutions/Makefile src/CUDA/Makefile src/OpenCL/Makefile src/dgemmsy/Makefile src/convolutions-c/Makefile src/art/Makefile src/tools/Makefile src/tools/bader/Makefile utils/Makefile utils/PSPfiles/Makefile pseudo/Makefile pseudo/src/Makefile pseudo/tests/Makefile doc/Makefile tests/Makefile tests/fft/Makefile tests/PSolver/Makefile tests/H2-freq/Makefile tests/MINHOP/Makefile tests/NEB/Makefile tests/NEB/input tests/NEB/NEB_include.sh tests/XabsCheb/Makefile tests/SPLSAD/Makefile tests/TDDFT/Makefile tests/OP2P/Makefile tests/DFT/Makefile tests/OpenCL/Makefile tests/CUDA/Makefile tests/ETSF_IO/Makefile tests/tutorials/Makefile tests/xc/Makefile" -+ac_config_files="$ac_config_files Makefile bigdft.pc libABINIT/src/Makefile config/Doxyfile src/Makefile src/modules/Makefile src/modules/configure.inc src/profiling/Makefile src/PSolver/Makefile src/convolutions/Makefile src/CUDA/Makefile src/OpenCL/Makefile src/dgemmsy/Makefile src/convolutions-c/Makefile src/art/Makefile src/tools/Makefile src/tools/bader/Makefile utils/Makefile utils/PSPfiles/Makefile pseudo/Makefile pseudo/src/Makefile pseudo/tests/Makefile doc/Makefile tests/Makefile tests/fft/Makefile tests/PSolver/Makefile tests/H2-freq/Makefile tests/MINHOP/Makefile tests/NEB/Makefile tests/NEB/input tests/NEB/NEB_include.sh tests/XabsCheb/Makefile tests/SPLSAD/Makefile tests/TDDFT/Makefile tests/OP2P/Makefile tests/DFT/Makefile tests/OpenCL/Makefile tests/CUDA/Makefile tests/ETSF_IO/Makefile tests/tutorials/Makefile tests/xc/Makefile" - - - # Call libXC ./configure script recursively. -@@ -9349,6 +9349,7 @@ - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "bigdft.pc") CONFIG_FILES="$CONFIG_FILES bigdft.pc" ;; - "libABINIT/src/Makefile") CONFIG_FILES="$CONFIG_FILES libABINIT/src/Makefile" ;; - "config/Doxyfile") CONFIG_FILES="$CONFIG_FILES config/Doxyfile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -diff -Naur bigdft-1.6-tuto_orig/configure.ac bigdft-1.6-tuto/configure.ac ---- configure.ac 2012-03-21 10:03:02.000000000 +0000 -+++ configure.ac 2012-03-21 10:48:53.000000000 +0000 -@@ -715,6 +715,7 @@ - dnl Give the name of file.in to transform to file - AC_CONFIG_FILES([ - Makefile -+bigdft.pc - libABINIT/src/Makefile - config/Doxyfile - src/Makefile -- cgit v1.2.3-65-gdbad