From nobody Sun Oct 17 20:24:31 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 13EF817F65D3; Sun, 17 Oct 2021 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HXWgz6qRyz3n11; Sun, 17 Oct 2021 20:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA433139CA; Sun, 17 Oct 2021 20:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19HKOVuK042334; Sun, 17 Oct 2021 20:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19HKOVVI042333; Sun, 17 Oct 2021 20:24:31 GMT (envelope-from git) Date: Sun, 17 Oct 2021 20:24:31 GMT Message-Id: <202110172024.19HKOVVI042333@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: c0c9c4917cd7 - main - devel/sd-mux-ctrl: Improve the patch. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0c9c4917cd79b46afad9a67cd1df705fd308bbb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0c9c4917cd79b46afad9a67cd1df705fd308bbb commit c0c9c4917cd79b46afad9a67cd1df705fd308bbb Author: Gleb Popov AuthorDate: 2021-10-17 11:42:59 +0000 Commit: Gleb Popov CommitDate: 2021-10-17 20:24:24 +0000 devel/sd-mux-ctrl: Improve the patch. --- devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt b/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt index ada33a872153..4c3432a360ad 100644 --- a/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt +++ b/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt @@ -1,12 +1,19 @@ ---- src/CMakeLists.txt.orig 2020-02-17 16:20:18 UTC +--- src/CMakeLists.txt.orig 2021-10-17 11:41:58 UTC +++ src/CMakeLists.txt -@@ -37,6 +37,9 @@ INCLUDE_DIRECTORIES( +@@ -35,6 +35,7 @@ SET(SDMUXCTRL_SOURCES + INCLUDE_DIRECTORIES( + ${SDMUXCTRL_PATH} ${FTD2XX_PATH} ++ ${SDMUX_DEP_INCLUDE_DIRS} ) -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${SDMUX_DEP_popt_INCLUDEDIR}") -+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SDMUX_DEP_popt_LIBDIR}") -+ ADD_EXECUTABLE(${TARGET_SDMUXCTRL} ${SDMUXCTRL_SOURCES}) +@@ -45,7 +46,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_SDMUXCTRL} PUBLIC TARGET_LINK_LIBRARIES(${TARGET_SDMUXCTRL} + ${SDMUX_DEP_LDFLAGS} +- ${SDMUX_DEP_LIBRARIES} ++ ${SDMUX_DEP_LINK_LIBRARIES} + ) + + INSTALL(TARGETS ${TARGET_SDMUXCTRL} DESTINATION ${BIN_INSTALL_DIR})