pkgsrc-WIP-changes archive

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

Copy tealdeer openssl approach



Module Name:	pkgsrc-wip
Committed By:	atomicules <base%atomicules.co.uk@localhost>
Pushed By:	atomicules
Date:		Mon Feb 4 11:26:46 2019 +0000
Changeset:	d0947a918b5e62f4f98ac1d65129c8ee6ca360a2

Modified Files:
	spotifyd/Makefile

Log Message:
Copy tealdeer openssl approach

Seems to work

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d0947a918b5e62f4f98ac1d65129c8ee6ca360a2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spotifyd/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diffs:
diff --git a/spotifyd/Makefile b/spotifyd/Makefile
index 0df7ec82a8..f455f0a831 100644
--- a/spotifyd/Makefile
+++ b/spotifyd/Makefile
@@ -275,9 +275,7 @@ CARGO_CRATE_DEPENDS+=	winutil-0.1.1
 CARGO_CRATE_DEPENDS+=	ws2_32-sys-0.2.1
 CARGO_CRATE_DEPENDS+=	xdg-2.1.0
 
-# Don't know why it can't find these or why it even needs it
-MAKE_ENV+= OPENSSL_INCLUDE_DIR=/usr/include/openssl
-MAKE_ENV+= OPENSSL_LIB_DIR=/usr/lib
+MAKE_ENV+=	OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 
 # Can't get it to link to pulseaudio, these worked outside of pkgsrc
 #MAKE_ENV+= RUSTFLAGS='-C link-args=-Wl,-rpath,/usr/lib,-rpath,/usr/pkg/lib'
@@ -288,4 +286,5 @@ do-build:
 .include "../../lang/rust/cargo.mk"
 .include "../../lang/rust/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index