From patchwork Sat Oct 14 16:55:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5563 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1953219jah; Sat, 14 Oct 2017 09:55:37 -0700 (PDT) X-Received: by 10.223.135.142 with SMTP id b14mr4222405wrb.277.1508000137698; Sat, 14 Oct 2017 09:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508000137; cv=none; d=google.com; s=arc-20160816; b=dJB6riZpONpNm0pTMFmZ5HA90eZd93tj8a992qOyDLlsCaYdtH+ieZ7fFBjTSjvkMs gnKeRsPs3xuQAI+DTnfSHpV4e7zGyOtFSCDWHSd8Y2hyw5CbTXo/OELBHOHmg5O/7STI i+xMjaQhyGckM3CDXSuROxPQEjzoXRLYkiWeNpMwjoLruBgWAHYAw/dYRHT1eSDAchCn G2lYgQ1Jxbi/nc5U+UwGUaAyezq/raccGNfKn3br1m2mB4FgTNp0teAVzjH72YeSCYyh 4B+p3ZUK1TRxVzWOucrMDEABa7feCAqhHGQhaekp06k5ddpcPlz6FtGWsAEVV0sfefeD Lfdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=GTmtLtznlyelruq9igfL00T5cnfCzAYBM32IOef9Z34=; b=B2KpT++nXTiuVrs2QTqoYv07+G+N3AuR8Zrt4SdRKX0vHzMs/zR8ZjnyHeojzETytG 3CB3FMKK7KDAQCFOogjKWIb74eaKfm8HlmVqqtEn82I7rOfToz2sXiK6mTjCcmz3sv/l 91NbwS7+dXywUDgMH2VZud/FTUDt8i9J6uVC+5sCOZDquz+k5FwtDniDfhGoWM18zYBK b49Al8mIUg54lhuh3VMJ0DMudo5tmukm/MRz+OIKH+n03swfsK/z51P5OwhSwQaguGYQ g2O1HlVWFfbAevmVKivuGf5qztGCOBQpDjjqhPMR6IzVOKaEEnClf5Z2KXZXvfz+k00P fnIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y9k28RUE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b203si2715166wmf.63.2017.10.14.09.55.36; Sat, 14 Oct 2017 09:55:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y9k28RUE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0F2B68A04B; Sat, 14 Oct 2017 19:55:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9546689A57 for ; Sat, 14 Oct 2017 19:55:25 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id 17so8391617qkq.8 for ; Sat, 14 Oct 2017 09:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=dF/9OC++lBKjS2drFigL7EYuxwZMmsK1LfNFbMM5kwM=; b=Y9k28RUEqkhIICaq2j7/j5vN1jq6YoQzs/iDBGZlwxqpuesRqxlT62HOsrAyVHwhrx GSq1nh62Tszgtf1lYMuXHRilMa8slOU2nSvcmTSPfu+sCfwRIhpQY8cIySyOFi+jwRTO TfhL5Wlys08tg4argw28IXz9IgoFTL5q+KuBjvnKZrgtmNtUgntK5xuAzvZLF8N3f74Y SH3+2v4U9LbAKaF6nspZhqyuHfvvXTIJ32c/7uly+vDx9uLNJZTNpJ41DDdbAb17m4Oe iek82purgHKDaPejDfOAuX3u+Ydghd3wKd5AhzHX4sM62WNLam7K4BzQLJ8dpGCMJGRT 9EPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dF/9OC++lBKjS2drFigL7EYuxwZMmsK1LfNFbMM5kwM=; b=LOoTqBB2o7x0oDX/F9xtzGh8AmxhjCGEZ9ejGn8wdGQOvs76fmB9TbFd9zBemHg1Wi HtD7NUuERU8Btr/rqP1Vo9jUrkH2lNi4OeRhicx4RsTC5qxRDUOoMOmPuvDtkA+wmwTB dTQ6qSSfd+nz/TtEr2SScHxeyEksJopQN1wDH6S8Lpy0qbP1WEvqWOdlEJAtkYbiSVZW zIWCYUO+Lw38cgLVzX3RoMD74hFtG2XwyiGgkIG8jVgygDAY+PJK3+p1fGafS0cWA+Fy LsiOgEK/jqadwM0JxJEdsAH+6hBf8fIFc5njNS3B6a+Z5Bpy/hrF1r8mTqVgxLYalH8q u9NA== X-Gm-Message-State: AMCzsaUYUhJCamgS/PbbTQga6HyqvMA5rsIQVr7EhI47wXTdWLxSzg+D mrYcWe2rsBh28uem+dRK3d/B6Q== X-Google-Smtp-Source: ABhQp+QHTEHBptar/GyuI2dUCRNHyWW5WXnP83++KI40bQVh6gTYeHQcnadZyIIIaZAvKqNYz1G42w== X-Received: by 10.55.6.22 with SMTP id 22mr6743155qkg.340.1508000128126; Sat, 14 Oct 2017 09:55:28 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id h1sm2122622qkf.10.2017.10.14.09.55.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Oct 2017 09:55:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Oct 2017 13:55:14 -0300 Message-Id: <20171014165514.360-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171014155926.5276-1-jamrial@gmail.com> References: <20171014155926.5276-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH] build: add global extralibs to pkg-config file generation 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Dependencies like libm and pthreads are now global again, so handle that while generating our pkg-config files. Signed-off-by: James Almer --- The pkg-config file generation nonetheless needs some more thought. Much like how we're dealing with external libs not properly listing all their dependencies for static builds, it's likely we're also doing something wrong in that regard. configure | 1 + ffbuild/pkgconfig_generate.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 09f8ed305b..56e9b906f8 100755 --- a/configure +++ b/configure @@ -7158,6 +7158,7 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} +extralibs="$extralibs" extralibs_avutil="$avutil_extralibs" extralibs_avcodec="$avcodec_extralibs" extralibs_avformat="$avformat_extralibs" diff --git a/ffbuild/pkgconfig_generate.sh b/ffbuild/pkgconfig_generate.sh index e5de6716d2..ed1cbb3635 100755 --- a/ffbuild/pkgconfig_generate.sh +++ b/ffbuild/pkgconfig_generate.sh @@ -12,7 +12,7 @@ shortname=$1 name=lib${shortname} fullname=${name}${build_suffix} comment=$2 -libs=$(eval echo \$extralibs_${shortname}) +libs=$(eval echo \$extralibs_${shortname} \$extralibs) deps=$(eval echo \$${shortname}_deps) for dep in $deps; do