From patchwork Sun Oct 21 20:43:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 10740 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3B8D1449224 for ; Sun, 21 Oct 2018 23:43:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DEFD68A56B; Sun, 21 Oct 2018 23:43:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.micronovasrl.com (mail.micronovasrl.com [212.103.203.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CDD9689BB8 for ; Sun, 21 Oct 2018 23:43:14 +0300 (EEST) Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id 6FFBFB005C7 for ; Sun, 21 Oct 2018 22:43:41 +0200 (CEST) Authentication-Results: mail.micronovasrl.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=micronovasrl.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=micronovasrl.com; h=references:in-reply-to:x-mailer:message-id:date:date:subject :subject:to:from:from; s=dkim; t=1540154620; x=1541018621; bh=zN CNomS2fJG/+Ozb9Oc+sw13XrisUWs2eL3YQWQeXUs=; b=AF2EaeS3sjW67ZRVXk cfOwiHytDHy4uAGY3IZw1eWYoAgWL3cci50qWG59ymvCgqKXFsUryP9dpmyTdiqJ SHLexxm/vrADWVME9jKbNDFt39VncfebHpcdCNVRpotizbFlynfdTMZvcKkWkxtN YZm0MjRS2NbGsl288EJr8YEzA= X-Virus-Scanned: Debian amavisd-new at mail.micronovasrl.com X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=unavailable autolearn_force=no Received: from mail.micronovasrl.com ([127.0.0.1]) by mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id KqG2vyoWvUMt for ; Sun, 21 Oct 2018 22:43:40 +0200 (CEST) Received: from ubuntu.localdomain (88-149-228-83.v4.ngi.it [88.149.228.83]) by mail.micronovasrl.com (Postfix) with ESMTPSA id C6701B00117; Sun, 21 Oct 2018 22:43:40 +0200 (CEST) From: Giulio Benetti To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Oct 2018 22:43:39 +0200 Message-Id: <20181021204339.44375-1-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 3.4] configure: add LIBDRM to Libs.private instead of Libs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Giulio Benetti MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently LIBDRM is appended to Libs: in libavutil.pc. This causes every program linking with avutil to link with -ldrm in both shared and static linking cases. In shared linking case it makes no sense, since -ldrm is a dependency of libavutil and is transparent while linking with libavutil - Add privatelibs_avutil variable for explicit private libraries to be appended to Libs.private: - Add $LIBDRM to privatelibs_avutil. Signed-off-by: Giulio Benetti --- configure | 3 ++- ffbuild/pkgconfig_generate.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9fe7760822..0996d8a85d 100755 --- a/configure +++ b/configure @@ -7096,7 +7096,8 @@ source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} -extralibs_avutil="$LIBRT $LIBDRM $LIBM" +extralibs_avutil="$LIBRT $LIBM" +privatelibs_avutil="$LIBDRM" extralibs_avcodec="$extralibs" extralibs_avformat="$extralibs" extralibs_avdevice="$extralibs" diff --git a/ffbuild/pkgconfig_generate.sh b/ffbuild/pkgconfig_generate.sh index e5de6716d2..b86486a107 100755 --- a/ffbuild/pkgconfig_generate.sh +++ b/ffbuild/pkgconfig_generate.sh @@ -13,6 +13,7 @@ name=lib${shortname} fullname=${name}${build_suffix} comment=$2 libs=$(eval echo \$extralibs_${shortname}) +privatelibs=$(eval echo \$privatelibs_${shortname}) deps=$(eval echo \$${shortname}_deps) for dep in $deps; do @@ -39,7 +40,7 @@ Requires: $($shared || echo $requires) Requires.private: $($shared && echo $requires) Conflicts: Libs: -L\${libdir} $rpath -l${fullname#lib} $($shared || echo $libs) -Libs.private: $($shared && echo $libs) +Libs.private: $($shared && echo $libs) ${privatelibs} Cflags: -I\${includedir} EOF