wok rev 9090

Fixed openmpi.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Mar 04 12:58:25 2011 +0000 (2011-03-04)
parents cb0af9eb8bcb
children b652293e5fe0
files openmpi-dev/receipt openmpi/receipt
line diff
     1.1 --- a/openmpi-dev/receipt	Fri Mar 04 18:23:34 2011 +0100
     1.2 +++ b/openmpi-dev/receipt	Fri Mar 04 12:58:25 2011 +0000
     1.3 @@ -12,8 +12,10 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/usr/lib/${PACKAGE%-dev}
     1.8 +	mkdir -p $fs/usr/lib/$WANTED
     1.9  	cp -a $_pkg/usr/include $fs/usr
    1.10 -	cp -a $_pkg/usr/lib/${PACKAGE%-dev}/pkgconfig $fs/usr/lib/${PACKAGE%-dev}
    1.11 +	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.12 +	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.13 +	cp -a $_pkg/usr/lib/$WANTED/*.*a $fs/usr/lib/$WANTED
    1.14  }
    1.15  
     2.1 --- a/openmpi/receipt	Fri Mar 04 18:23:34 2011 +0100
     2.2 +++ b/openmpi/receipt	Fri Mar 04 12:58:25 2011 +0000
     2.3 @@ -15,9 +15,7 @@
     2.4  compile_rules()
     2.5  {
     2.6  	cd $src
     2.7 -   ./configure --prefix=/usr \
     2.8 -               --sysconfdir=/etc/${PACKAGE} \
     2.9 -               --mandir=/usr/share/man \
    2.10 +   ./configure --sysconfdir=/etc/${PACKAGE} \
    2.11                 --enable-mpi-f90 \
    2.12                 --libdir=/usr/lib/${pkgname} \
    2.13                 --with-threads=posix \
    2.14 @@ -28,19 +26,18 @@
    2.15                 --without-slurm \
    2.16                 --with-libltdl=/usr \
    2.17                 FC=/usr/bin/gfortran \
    2.18 -               LDFLAGS='-Wl,-z,noexecstack' \
    2.19 -		$CONFIGURE_ARGS &&
    2.20 -	make -j 4 && make DESTDIR=$PWD/_pkg install
    2.21 +               LDFLAGS='-Wl,-z,noexecstack' &&
    2.22 +	make && make install
    2.23  }
    2.24  
    2.25  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.26  genpkg_rules()
    2.27  {
    2.28 -	mkdir -p $fs/usr/lib/$PACKAGE/$PACKAGE
    2.29 +	mkdir -p $fs/usr/lib/$PACKAGE
    2.30  	cp -a $_pkg/etc $fs
    2.31  	cp -a $_pkg/usr/bin $fs/usr
    2.32 +	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.33  	cp -a $_pkg/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
    2.34 -	cp -a $_pkg/usr/lib/$PACKAGE/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE/$PACKAGE
    2.35 -	cp -a $_pkg/usr/lib/$PACKAGE/mpi.mod $fs/usr/lib/$PACKAGE
    2.36 +	cp -a $_pkg/usr/lib/mpi.mod $fs/usr/lib
    2.37  }
    2.38