From nobody Thu Oct 17 19:06:19 2024 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 4XTy3v5KBwz5ZMh3; Thu, 17 Oct 2024 19:06:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTy3v43n5z4R3g; Thu, 17 Oct 2024 19:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729191979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUnw5oMYW0ZZn5XoNDOZmhab4xnhsA/Ft4DPQk4p0pY=; b=sAp9mYBvdRBrW/08e7B/owseTbk2XBFo+olHjOqP5UvJCRTmFp6YY954bUhzSYfGJe5Ktr nPRv+tK/RHWWqa/qvORzfhiQsmEkymDUShBhlQXIGZurL5f7k1BrkJ2CuD3WNm7l+swCoP DS5YfNdwEZP1WIAo2FxYokEHIwgFGDDSpHWA3BtfGn2ctjn/79j/9EdMJzYgDNNGPoKK2D 6GUxcDm3KFwlGT3APx55r9xTrfiLDlFzXcFsJkXBAX8qxR63HPL2qfMhaCxvQill2PT5pu qelvxO+ETD9rHvisab2APMLLS6Jn3tYsTO7T5iyUYq5slrPJn71sf3t4uC14GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729191979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUnw5oMYW0ZZn5XoNDOZmhab4xnhsA/Ft4DPQk4p0pY=; b=hhZu2Fia6WA8uH8rQw9Dax34G2ZL1SZQOn8njSZCN0JbVHjCKqbsxlnnQ0Ir9+T+4YCAqJ xn9gf40YPhM5slbCM76I+bgJjF7dcTiznl8gddGzeN6ESlx9mc7xn50iR/q4WAl5CmAEeZ qsecyxk5DsOqv4CWCKal6jZa5HG8COg3gekDGAInGnHfOWXoctmqNrsSUGodC5pQrblZZK HRKL8HWGjc0PHAe3RH4+OspiNu1lFTeIlrXj0fTVESypQPmQWcqNg3cHqNpSOm2x6vTtme e5Ey7xp5RyIgvDYdEgoyOscOlD715gkN3vZFNdK7rvRiXF5iA71gmgpAHDhWDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729191979; a=rsa-sha256; cv=none; b=q6OgHBfOf+c3r8eDis45y7/ttqogZmbVYhIfXQm61MUvgCfrR8rUW0/RS7NEf5ByK473nT PpKakyeR8ZKh0Ly18QVTLIQKlb2BVN6cjMpXLfRyK2ndxdyM94DNZmf898j9KvzqeVo31B sj5Ewnkqc9dyuzWdXV8E1PwPW9QHMVeJZU67RRPQD5+BdSDnsw0emKGlrlpXLrtZVFsBkr 4ERHXTEIMqjoPuhbtMlLlwnHKQcy91W9gdyScKZHFugQZjv0Ay21ae3dQIpizlB6p/CeQ9 yvRzcGgc/QbhDM1VY1cELX+//3iYRe+cBgLKkbVBzLHYh7py0/TZdSibxWPQdQ== 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 4XTy3v35r4z12Mt; Thu, 17 Oct 2024 19:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HJ6JKB089600; Thu, 17 Oct 2024 19:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HJ6JU6089597; Thu, 17 Oct 2024 19:06:19 GMT (envelope-from git) Date: Thu, 17 Oct 2024 19:06:19 GMT Message-Id: <202410171906.49HJ6JU6089597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 50d58e1d133f - main - devel/libdatadog: Simplify Makefile 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50d58e1d133f25c71526c007f67fc75e612abceb Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=50d58e1d133f25c71526c007f67fc75e612abceb commit 50d58e1d133f25c71526c007f67fc75e612abceb Author: Po-Chuan Hsieh AuthorDate: 2024-10-17 19:02:35 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-10-17 19:02:35 +0000 devel/libdatadog: Simplify Makefile --- devel/libdatadog/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/libdatadog/Makefile b/devel/libdatadog/Makefile index 4675c062704b..1bce186a20ab 100644 --- a/devel/libdatadog/Makefile +++ b/devel/libdatadog/Makefile @@ -21,11 +21,12 @@ GH_ACCOUNT= DataDog NATIVE_STATIC_LIBS= -lpthread -lrt -lexecinfo -lutil -lc -lm post-patch: - @${SED} -e 's|@Datadog_VERSION@|${PORTVERSION}|' ${WRKSRC}/profiling-ffi/datadog_profiling.pc.in > ${WRKSRC}/datadog_profiling.pc - @${SED} -e 's|@Datadog_VERSION@|${PORTVERSION}|' ${WRKSRC}/profiling-ffi/datadog_profiling_with_rpath.pc.in > ${WRKSRC}/datadog_profiling_with_rpath.pc - @${SED} -e 's|@Datadog_VERSION@|${PORTVERSION}|; s|@Datadog_LIBRARIES@|${NATIVE_STATIC_LIBS}|' ${WRKSRC}/profiling-ffi/datadog_profiling-static.pc.in > ${WRKSRC}/datadog_profiling-static.pc - @${SED} -e 's|@Datadog_LIBRARIES@|${NATIVE_STATIC_LIBS}|' ${WRKSRC}/cmake/DatadogConfig.cmake.in > ${WRKSRC}/DatadogConfig.cmake - @${SED} -e 's|@Datadog_LIBRARIES@|${NATIVE_STATIC_LIBS}|' ${WRKSRC}/cmake/DataPipelineConfig.cmake.in > ${WRKSRC}/DataPipelineConfig.cmake +.for file in datadog_profiling datadog_profiling-static datadog_profiling_with_rpath + @${SED} -e 's|@Datadog_VERSION@|${PORTVERSION}|; s|@Datadog_LIBRARIES@|${NATIVE_STATIC_LIBS}|' ${WRKSRC}/profiling-ffi/${file}.pc.in > ${WRKSRC}/${file}.pc +.endfor +.for file in DatadogConfig DataPipelineConfig + @${SED} -e 's|@Datadog_LIBRARIES@|${NATIVE_STATIC_LIBS}|' ${WRKSRC}/cmake/${file}.cmake.in > ${WRKSRC}/${file}.cmake +.endfor # Fix sys-info-0.9.1 on 32-bit architectures, see also https://github.com/FillZpp/sys-info-rs/issues/80 @${SED} -i '' -e '/get_cpu/ s|unsigned long|uint64_t|; /get_proc_total/ s|unsigned long|uint64_t|' ${WRKSRC}/cargo-crates/sys-info-0.9.1/c/*.[ch] @@ -41,10 +42,10 @@ post-build: @${MV} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libtest_spawn_from_lib.so ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/libtest_spawn_from_lib.so.skip do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/libdatadog-crashtracking-receiver ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${PREFIX}/include/datadog/ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/libdatadog/ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ + ${INSTALL_PROGRAM} ${WRKSRC}/libdatadog-crashtracking-receiver ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${CARGO_TARGET_DIR}/include/datadog/*.h ${STAGEDIR}${PREFIX}/include/datadog/ ${INSTALL_DATA} ${WRKSRC}/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake/libdatadog/ ${INSTALL_DATA} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/release/*.a ${STAGEDIR}${PREFIX}/lib/