diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-02 20:41:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-03 08:59:43 +0100 |
commit | 0dada1b8719e049f5e3d73034824296a89c4506f (patch) | |
tree | 9fd892519aff555e9603a013bf3f5d8b14228975 /source/l/libjpeg-turbo | |
parent | 190c4fa1486b1dc8cf82ea8ba06de852489d4e13 (diff) | |
download | current-0dada1b8719e049f5e3d73034824296a89c4506f.tar.gz current-0dada1b8719e049f5e3d73034824296a89c4506f.tar.xz |
Fri Nov 2 20:41:52 UTC 201820181102204152
a/haveged-1.9.4-x86_64-1.txz: Upgraded.
a/kernel-firmware-20181026_1baa348-noarch-1.txz: Upgraded.
a/mcelog-161-x86_64-1.txz: Upgraded.
ap/powertop-2.9-x86_64-1.txz: Upgraded.
d/clisp-2.49_20180922_228b90a52-x86_64-1.txz: Upgraded.
d/mercurial-4.8-x86_64-1.txz: Upgraded.
l/fribidi-1.0.5-x86_64-1.txz: Upgraded.
l/libjpeg-turbo-2.0.0-x86_64-1.txz: Upgraded.
n/lynx-2.8.9rel.1-x86_64-1.txz: Upgraded.
t/texlive-2018.180822-x86_64-3.txz: Rebuilt.
Rebuilt to recompile xindy for the upgraded CLISP runtime.
Diffstat (limited to 'source/l/libjpeg-turbo')
-rwxr-xr-x | source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild index 89065e1af..cf7c1b374 100755 --- a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild +++ b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libjpeg-turbo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -91,20 +91,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Configure: -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --includedir=/usr/include \ - --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux || exit 1 - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG docdir=/usr/doc/$PKGNAM-$VERSION || exit 1 +# Configure, build, and install: +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/libjpeg-turbo-${VERSION} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DENABLE_STATIC=OFF \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la |