Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2012-09-26 09:54:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2012-09-17 16:57:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2012-09-26 09:54:37.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 24 12:29:04 UTC 2012 - [email protected] + +- don't use deprecated macro makeinstall +- enable test suite for parallel builds +- always build out of tree instead of copying sources + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.K9Rog2/_old 2012-09-26 09:54:39.000000000 +0200 +++ /var/tmp/diff_new_pack.K9Rog2/_new 2012-09-26 09:54:39.000000000 +0200 @@ -275,21 +275,21 @@ %patch4 -p0 -b .tests-arm %endif -set -- * -for mpi in %_mpi -do - mkdir $mpi - cp -ap "$@" $mpi +for build_dir in build %_mpi; do + mkdir $build_dir + ln -s ../configure $build_dir done %build export CC=gcc export CXX=g++ export F9X=gfortran -export CFLAGS="${RPM_OPT_FLAGS/O2/O0}" +export CFLAGS="${RPM_OPT_FLAGS/-O2/-O0}" # export CFLAGS="%%{optflags} -fno-strict-aliasing" +pushd build %configure \ + --docdir=%{_docdir}/%{name} \ --disable-dependency-tracking \ %if 0%{?suse_version} > 1140 --enable-fortran \ @@ -300,6 +300,7 @@ --with-pthread make %{?_smp_mflags} +popd for mpi in %_mpi; do @@ -307,8 +308,9 @@ export CC="%{_libdir}/mpi/gcc/$mpi/bin/mpicc" export FC="%{_libdir}/mpi/gcc/$mpi/bin/mpif90" export F77="%{_libdir}/mpi/gcc/$mpi/bin/mpif77" -export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/$mpi/%_lib +export LD_LIBRARY_PATH="%{_libdir}/mpi/gcc/$mpi/%_lib" %configure \ + --docdir=%{_docdir}/%{name} \ --prefix=%{_libdir}/mpi/gcc/$mpi \ --bindir=%{_libdir}/mpi/gcc/$mpi/bin \ --libdir=%{_libdir}/mpi/gcc/$mpi/%_lib \ @@ -328,9 +330,11 @@ done %install -%makeinstall docdir=%{buildroot}%{_docdir} -rm -rf %{buildroot}/%{_libdir}/*.la +for build_dir in build %_mpi; do + make install DESTDIR="%buildroot" -C "$build_dir" +done +find "%buildroot/%_libdir" -type f -name "*.la" -delete find %{buildroot}%{_datadir}/hdf5_examples -type f \ | grep -v ".sh$" | xargs chmod 644 %if 0%{?suse_version} >= 1110 @@ -350,17 +354,13 @@ %_hdf5_version %{version} EOF -# install parallel version -for mpi in %_mpi; -do -cd $mpi -%makeinstall docdir=%{buildroot}%{_docdir} -rm -rf %{buildroot}/%{_libdir}/mpi/gcc/$mpi/%_lib/*.la -cd .. -done - %check -make check +make -C build check +# ignore errors for parallel builds +export HDF5_Make_Ignore=yes +for mpi in %_mpi; do + make -C $mpi check +done %post -n %{libname}-%{hdf5_libver} -p /sbin/ldconfig -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
