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 424E2A0C4B; Mon, 22 Nov 2021 21:17:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0308540040; Mon, 22 Nov 2021 21:17:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0A86F4003C for ; Mon, 22 Nov 2021 21:17:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637612227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ob/+N8Nx+LGKnVUjwRpbcMD4NlzMCQQBtEm858saDUo=; b=dNyH6L5L4HzcqYmKulpoqieSPzSUF0oObeW4aftqHoX/a51+XDsz2LMm2c2iOJwjtMGfO3 mrf3x/eeYGd/DyR5sEPDOSYH/cIglRwYjE/DWMrVbzUKBrLWEjZAZRtkyd3NXNtI0YsSeH lOj8ZjH4v4jHqG4mV4uiN97YxhFU7wM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-205-UMgWXpyrM5KF_6k6gC03ng-1; Mon, 22 Nov 2021 15:17:04 -0500 X-MC-Unique: UMgWXpyrM5KF_6k6gC03ng-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E913315737; Mon, 22 Nov 2021 20:17:02 +0000 (UTC) Received: from aldebaran.redhat.com (unknown [10.39.194.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id D388419D9F; Mon, 22 Nov 2021 20:17:01 +0000 (UTC) From: Timothy Redaelli To: Ferruh Yigit , Thomas Monjalon Cc: dev@dpdk.org Subject: [PATCH] doc: add build_root to STRIP_FROM_PATH Date: Mon, 22 Nov 2021 21:16:53 +0100 Message-Id: <1f6e95f1c4e148a18d8de8dc25d8bb63c094af60.1637612120.git.tredaelli@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=tredaelli@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org examples.dox is built inside builddir and so doxygen generates some dir_HASH.html that includes the builddir name and this may prevent DPDK documentation to be correctly generated in some distributions, for example CentOS Stream 9 and RHEL9, since the builddir includes the architecture. This commit adds builddir to STRIP_FROM_PATH in order to avoid generating html files that includes it. Fixes: a6090630f4e5 ("doc: automate examples file list for API") Cc: ferruh.yigit@intel.com Signed-off-by: Timothy Redaelli --- doc/api/doxy-api.conf.in | 1 + doc/api/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index db2ca9b6ed..a668cad687 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -112,6 +112,7 @@ EXAMPLE_RECURSIVE = YES OUTPUT_DIRECTORY = @OUTPUT@ STRIP_FROM_PATH = @STRIP_FROM_PATH@ +STRIP_FROM_PATH += @BUILDDIR@ GENERATE_HTML = YES HTML_OUTPUT = @HTML_OUTPUT@ GENERATE_LATEX = NO diff --git a/doc/api/meson.build b/doc/api/meson.build index d34c383694..6dda9bec46 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -37,6 +37,7 @@ cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) cdata.set('HTML_OUTPUT', 'html') cdata.set('TOPDIR', meson.source_root()) cdata.set('STRIP_FROM_PATH', meson.source_root()) +cdata.set('BUILDDIR', meson.build_root()) cdata.set('WARN_AS_ERROR', 'NO') if get_option('werror') cdata.set('WARN_AS_ERROR', 'YES') -- 2.33.1