diff options
Diffstat (limited to 'sord')
-rwxr-xr-x | sord/build/sord.SlackBuild | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/sord/build/sord.SlackBuild b/sord/build/sord.SlackBuild index 87d0b41c..35b7e924 100755 --- a/sord/build/sord.SlackBuild +++ b/sord/build/sord.SlackBuild @@ -158,16 +158,21 @@ echo Building ... export LDFLAGS="$SLKLDFLAGS" export CXXFLAGS="$SLKCFLAGS" export CFLAGS="$SLKCFLAGS" -python2 waf configure \ - --prefix=/usr \ - --configdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - -python2 waf build 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -python2 waf install --destdir=$PKG 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +mkdir meson-build +cd meson-build + meson setup \ + --prefix=/usr \ + --mandir=/usr/man \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --buildtype=release \ + -Ddocs=disabled \ + .. \ + 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log + ninja $NUMJOBS \ + 2>&1 | tee $OUTPUT/make-${PRGNAM}.log + DESTDIR=$PKG ninja install \ + 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +cd - 1>/dev/null # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -193,9 +198,9 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep |