# HG changeset patch # User Christopher Rogers # Date 1299243505 0 # Node ID a5054134e5b51392b36b29cc0acee86fc9b62ca0 # Parent cb0af9eb8bcb427daf5916fcfca5e56c02cb7235 Fixed openmpi. diff -r cb0af9eb8bcb -r a5054134e5b5 openmpi-dev/receipt --- a/openmpi-dev/receipt Fri Mar 04 18:23:34 2011 +0100 +++ b/openmpi-dev/receipt Fri Mar 04 12:58:25 2011 +0000 @@ -12,8 +12,10 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/${PACKAGE%-dev} + mkdir -p $fs/usr/lib/$WANTED cp -a $_pkg/usr/include $fs/usr - cp -a $_pkg/usr/lib/${PACKAGE%-dev}/pkgconfig $fs/usr/lib/${PACKAGE%-dev} + cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib + cp -a $_pkg/usr/lib/*.*a $fs/usr/lib + cp -a $_pkg/usr/lib/$WANTED/*.*a $fs/usr/lib/$WANTED } diff -r cb0af9eb8bcb -r a5054134e5b5 openmpi/receipt --- a/openmpi/receipt Fri Mar 04 18:23:34 2011 +0100 +++ b/openmpi/receipt Fri Mar 04 12:58:25 2011 +0000 @@ -15,9 +15,7 @@ compile_rules() { cd $src - ./configure --prefix=/usr \ - --sysconfdir=/etc/${PACKAGE} \ - --mandir=/usr/share/man \ + ./configure --sysconfdir=/etc/${PACKAGE} \ --enable-mpi-f90 \ --libdir=/usr/lib/${pkgname} \ --with-threads=posix \ @@ -28,19 +26,18 @@ --without-slurm \ --with-libltdl=/usr \ FC=/usr/bin/gfortran \ - LDFLAGS='-Wl,-z,noexecstack' \ - $CONFIGURE_ARGS && - make -j 4 && make DESTDIR=$PWD/_pkg install + LDFLAGS='-Wl,-z,noexecstack' && + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/$PACKAGE/$PACKAGE + mkdir -p $fs/usr/lib/$PACKAGE cp -a $_pkg/etc $fs cp -a $_pkg/usr/bin $fs/usr + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE - cp -a $_pkg/usr/lib/$PACKAGE/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE/$PACKAGE - cp -a $_pkg/usr/lib/$PACKAGE/mpi.mod $fs/usr/lib/$PACKAGE + cp -a $_pkg/usr/lib/mpi.mod $fs/usr/lib }