pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/filesystems/squashfs Fix build of squashfs on CentOS 7.x



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c0a2966794f
branches:  trunk
changeset: 359411:5c0a2966794f
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Thu Mar 09 16:31:50 2017 +0000

description:
Fix build of squashfs on CentOS 7.x

Fix usage of do-build, don't reinvent it without missing parameters passed
to gmake(1).

Include required lzo, xz, zlib.

Bump PKGREVISION to 2.

diffstat:

 filesystems/squashfs/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 9e1fcb6e96e0 -r 5c0a2966794f filesystems/squashfs/Makefile
--- a/filesystems/squashfs/Makefile     Thu Mar 09 16:30:12 2017 +0000
+++ b/filesystems/squashfs/Makefile     Thu Mar 09 16:31:50 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2017/02/09 18:16:07 scole Exp $
+# $NetBSD: Makefile,v 1.4 2017/03/09 16:31:50 kamil Exp $
 
 VERSION=        4.3
 DISTNAME=       squashfs${VERSION}
 PKGNAME=        squashfs-${VERSION}
 
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=     filesystems
 MASTER_SITES=   http://downloads.sourceforge.net/project/squashfs/squashfs/${DISTNAME}/
 
@@ -29,9 +29,7 @@
 WRKSRC=                ${SQUASH_DIR}/squashfs-tools
 SQUASH_PKG_DOC=        ${DESTDIR}${PREFIX}/share/doc/squashfs
 
-do-build:
-       cd ${WRKSRC} && env EXTRA_LDFLAGS="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
-               ${GMAKE} ${BUILD_MAKE_FLAGS}
+MAKE_ENV+=     EXTRA_LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/mksquashfs ${DESTDIR}${PREFIX}/bin
@@ -47,4 +45,7 @@
        ${INSTALL_DATA} ${SQUASH_DIR}/OLD-READMEs/*      ${SQUASH_PKG_DOC}/OLD-READMEs/
        ${INSTALL_DATA} ${SQUASH_DIR}/pseudo-file.example ${DESTDIR}${PREFIX}/share/examples/squashfs/
 
+.include "../../archivers/lzo/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index