From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D02BA034F for ; Wed, 22 Dec 2021 16:19:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C5CD410FC; Wed, 22 Dec 2021 16:19:48 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 9D4E44003C; Wed, 22 Dec 2021 16:19:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640186386; x=1671722386; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0P7yjJrVPfZ67OESEWM746/lt57vPnYpqRjjuN4ysH4=; b=RPKQgHI7Kj33EhD0hyQOHRoHxJWwCtNBexuDPR9QeG+DdREY6mBt9vkO KMbuohbUSNPokcBivF21b4SppAetsbAx3ft2lYE3h1tilXt8Ddj2ercVa L4qJdcTRSG0JZ2VZ58UY4D263W3ETg7EbUzeUxqcp8/4a1AKlSq91WrNP 5RR3KnpO/8LivGSJus2eweuxE5569zRs6p9iqaoVOUPtmzruBrdzd8tAO CnUJj3rH4pQ9aybzRy8lUP51Drq1BFlQkZ8J0Nf+urQoB61Ieo4NILYEi iiKy4mHtSEbx/XMDJTxLPSBhsOjYoCv/551Hc2aKL58GY0b4fJeerTAPM w==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="221316372" X-IronPort-AV: E=Sophos;i="5.88,226,1635231600"; d="scan'208";a="221316372" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2021 07:19:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,226,1635231600"; d="scan'208";a="508504744" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga007.jf.intel.com with ESMTP; 22 Dec 2021 07:19:13 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , bluca@debian.org, thomas@monjalon.net, stable@dpdk.org Subject: [PATCH] doc/api: remove dependency on findutils on FreeBSD Date: Wed, 22 Dec 2021 15:18:55 +0000 Message-Id: <20211222151855.803916-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Standard "find" on BSD does not support the "-printf" so gfind from findutils package was used to enable full doc builds. We can remove this extra dependency by using "sed" and "tr" to adjust the output from regular find instread. Fixes: 8260f4f98cfe ("mk: use script to generate examples.dox") Fixes: 499fe9dfcfc7 ("doc: add dependency on examples for API doxygen") Fixes: 897e55c8d27f ("doc: fix Doxygen examples build on FreeBSD") Cc: bluca@debian.org Cc: thomas@monjalon.net Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- doc/api/generate_examples.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/doc/api/generate_examples.sh b/doc/api/generate_examples.sh index 3e08236596..16949cb47a 100755 --- a/doc/api/generate_examples.sh +++ b/doc/api/generate_examples.sh @@ -6,21 +6,13 @@ EXAMPLES_DIR=$1 API_EXAMPLES=$2 FIND=find -if [ "$(uname)" = "FreeBSD" ] ; then -# on FreeBSD, we need GNU find for "-printf" flag - FIND=gfind - if ! which -s $FIND ; then - echo "Error: need '$FIND' on FreeBSD. Install 'findutils' pkg" - exit 1 - fi -fi # generate a .d file including both C files and also build files, so we can # detect both file changes and file additions/deletions -echo "$API_EXAMPLES: $($FIND ${EXAMPLES_DIR} -type f \( -name '*.c' -o -name 'meson.build' \) -printf '%p ' )" > ${API_EXAMPLES}.d +echo "$API_EXAMPLES: $($FIND ${EXAMPLES_DIR} -type f \( -name '*.c' -o -name 'meson.build' \) | tr '\n' ' ' )" > ${API_EXAMPLES}.d exec > "${API_EXAMPLES}" printf '/**\n' printf '@page examples DPDK Example Programs\n\n' -$FIND "${EXAMPLES_DIR}" -type f -name '*.c' -printf '@example examples/%P\n' | LC_ALL=C sort +$FIND "${EXAMPLES_DIR}" -type f -name '*.c' | sed "s|${EXAMPLES_DIR}|@example examples|" | LC_ALL=C sort printf '*/\n' -- 2.32.0