From patchwork Sat Jan 18 08:51:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 312275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 412382C008F for ; Sat, 18 Jan 2014 19:51:52 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F2EA68BE6A; Sat, 18 Jan 2014 08:51:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bgNuMgWcmZSG; Sat, 18 Jan 2014 08:51:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A13968BE6D; Sat, 18 Jan 2014 08:51:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 444E21C2445 for ; Sat, 18 Jan 2014 08:51:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3EF638B716 for ; Sat, 18 Jan 2014 08:51:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fvns9fgkW+0k for ; Sat, 18 Jan 2014 08:51:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s33.blu0.hotmail.com (blu0-omc3-s33.blu0.hotmail.com [65.55.116.108]) by whitealder.osuosl.org (Postfix) with ESMTP id 769848B5D5 for ; Sat, 18 Jan 2014 08:51:47 +0000 (UTC) Received: from BLU0-SMTP258 ([65.55.116.72]) by blu0-omc3-s33.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 18 Jan 2014 00:51:47 -0800 X-TMN: [CeigtLLOpKeuR/anyswJila/ntVgNCYB] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.174.178]) by BLU0-SMTP258.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 18 Jan 2014 00:51:45 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:41577) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1W4Rd0-0006rt-9z; Sat, 18 Jan 2014 09:51:42 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Sat, 18 Jan 2014 09:51:39 +0100 X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 18 Jan 2014 08:51:45.0401 (UTC) FILETIME=[84125690:01CF142A] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] minidlna: Fix configure ffmpeg detection when OpenSSL support is enabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Fixes http://autobuild.buildroot.net/results/c66/c663a518f65e786895d9ad8866193f70cbd6e96d// Signed-off-by: Bernd Kuhls --- package/minidlna/minidlna.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 94c2641..174f650 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -13,13 +13,18 @@ MINIDLNA_DEPENDENCIES = \ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \ host-xutil_makedepend +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MINIDLNA_FFMPEG_SSL_LIBS=-lcrypto -lssl +endif + ifeq ($(BR2_PREFER_STATIC_LIB),y) # the configure script / Makefile forgets to link with some of the dependent # libraries breaking static linking, so help it along MINIDLNA_CONF_ENV = \ - LIBS='-lavformat -lavcodec -lavutil -logg -lz -lpthread -lm' + LIBS='-lavformat -lavcodec -lavutil -logg -lz -lpthread -lm $(MINIDLNA_FFMPEG_SSL_LIBS)' else MINIDLNA_CONF_OPT = \ + LIBS='$(MINIDLNA_FFMPEG_SSL_LIBS)' \ --disable-static endif