svn commit: r518756 - head/x11/squeekboard

Jan Beich jbeich at FreeBSD.org
Sun Dec 1 08:19:02 UTC 2019


Author: jbeich
Date: Sun Dec  1 08:19:02 2019
New Revision: 518756
URL: https://svnweb.freebsd.org/changeset/ports/518756

Log:
  x11/squeekboard: unbreak if LDFLAGS contain comma
  
  $ LDFLAGS=-Wl,--as-needed make
  [...]
  sed: 1: "/^cargo/ {  s,^,cmd=$1; ...": bad flag in substitute command: '-'

Modified:
  head/x11/squeekboard/Makefile   (contents, props changed)

Modified: head/x11/squeekboard/Makefile
==============================================================================
--- head/x11/squeekboard/Makefile	Sun Dec  1 08:18:55 2019	(r518755)
+++ head/x11/squeekboard/Makefile	Sun Dec  1 08:19:02 2019	(r518756)
@@ -25,6 +25,7 @@ USE_GNOME=	cairo gdkpixbuf2 gtk30
 GL_SITE=	https://source.puri.sm
 GL_ACCOUNT=	Librem5
 GL_COMMIT=	579ba8ab87f395c550eede40922b498feb245300
+MAKE_ENV=	CARGO_ENV='${CARGO_ENV:N*TARGET_DIR*}'
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}-real \
 		share/applications/sm.puri.Squeekboard.desktop
@@ -79,7 +80,7 @@ post-patch:
 # Add --verbose after each cargo subcommand
 # Don't use BSD realpath(1) against non-existing files
 	@${REINPLACE_CMD} -e '/^cargo/ { \
-		  s,^,cmd=$$1;shift;${CARGO_ENV:N*TARGET_DIR*} ,; \
+		  s,^,cmd=$$1; shift; eval export $${CARGO_ENV}; ,; \
 		  s,"$$@","$$cmd" --verbose &,; }' \
 		-e '/OUT_PATH=/s,=.*,=$$PWD/$$1,' \
 		${WRKSRC}/cargo*.sh


More information about the svn-ports-all mailing list