pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ncspot: misc fixes
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Fri Aug 14 12:24:57 2020 +0200
Changeset: ee8258676fc7a0fbf9399484d017e29e848ad2f8
Modified Files:
ncspot/Makefile
Log Message:
ncspot: misc fixes
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee8258676fc7a0fbf9399484d017e29e848ad2f8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ncspot/Makefile | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diffs:
diff --git a/ncspot/Makefile b/ncspot/Makefile
index d02192928b..e2c4170ec9 100644
--- a/ncspot/Makefile
+++ b/ncspot/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE= https://github.com/hrkfdn/ncspot/
COMMENT= Cross-platform ncurses Spotify client written in Rust
LICENSE= 2-clause-bsd
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+= c c++ # rust, but needs a toolchain to link
USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 37
PYTHON_FOR_BUILD_ONLY= tool
-USE_NCURSES= yes # NCURSES_MOUSE_VERSION
+USE_NCURSES= yes # NCURSES_MOUSE_VERSION, also needs wide support
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
@@ -412,17 +412,22 @@ CARGO_CRATE_DEPENDS+= xi-unicode-0.2.1
INSTALLATION_DIRS= bin
-MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
+RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.portaudio}/lib
+MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}
do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --release -j${_MAKE_JOBS_N}
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --release --offline -j${_MAKE_JOBS_N}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/target/release/ncspot ${DESTDIR}${PREFIX}/bin
-.include "../../security/openssl/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libxcb?= build
.include "../../x11/libxcb/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
.include "../../lang/rust/cargo.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index