From patchwork Sat Jan 25 15:26:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 314147 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 689272C007A for ; Sun, 26 Jan 2014 02:27:03 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09A4B8B7FF; Sat, 25 Jan 2014 15:27:02 +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 6XWERiL4yjn1; Sat, 25 Jan 2014 15:27:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 77AAB8AFA7; Sat, 25 Jan 2014 15:27:01 +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 E93961BF94F for ; Sat, 25 Jan 2014 15:27:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E23998B507 for ; Sat, 25 Jan 2014 15:27:00 +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 iKrPdfSSQ-fy for ; Sat, 25 Jan 2014 15:27:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 201D78B4EE for ; Sat, 25 Jan 2014 15:26:59 +0000 (UTC) Received: by mail-we0-f172.google.com with SMTP id q58so3813842wes.3 for ; Sat, 25 Jan 2014 07:26:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wcA4/I/lxTU1Qnl3MGcHgJwg+xX1eQ4+GIicClIKPpk=; b=S/LMCEyIGtP8TXYivpwrN1vWzy5avAMAEHG+bJVA/OzCpDvaxZND44jDON44KfmD3v KHWEkgLwDW6uu4n5T3X1qyF/f+r70X1Jljs7xdm7mCoacctAsHj5fTSEwh6YPZ1IWow6 m92sLdATd1jFrpNaoiFrCp2uLhHX2uiO02bV0GEc2HSS2CrowgLQIshaC6bLI7v1Xe0P H0nmnKT6ZzENPvY4WeuhYVcpzA7yuN9lt43gQMQu0Pmh8kHF7WVjpL6GgNpxr7B5agCy NVkPgkJOfsEFtdbPtS9MWvWJT7mfE/rAFro6uJ+TE3/pichZFhwbnZgG5zKWsYbXOpIg CX6g== X-Received: by 10.180.77.74 with SMTP id q10mr6757148wiw.39.1390663618712; Sat, 25 Jan 2014 07:26:58 -0800 (PST) Received: from localhost (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id el1sm3654471wib.4.2014.01.25.07.26.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 25 Jan 2014 07:26:58 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Sat, 25 Jan 2014 16:26:48 +0100 Message-Id: <1390663608-1481-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.2 Subject: [Buildroot] [PATCH] rtmpdump: fix build with selected crypto 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net After the patch 42ed108013082c6836673aabe8d6258f9e7a490f, the defaut crypto engine became GNUTLS, this made the build failed as the CFLAGS variable where not correctly passed to the Makefile. Signed-off-by: Maxime Hadjinlian Cc:"Yann E. MORIN" --- ...p-0001-Fix-override-of-CFLAGS-and-LDFLAGS.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/rtmpdump/rtmpdump-0001-Fix-override-of-CFLAGS-and-LDFLAGS.patch diff --git a/package/rtmpdump/rtmpdump-0001-Fix-override-of-CFLAGS-and-LDFLAGS.patch b/package/rtmpdump/rtmpdump-0001-Fix-override-of-CFLAGS-and-LDFLAGS.patch new file mode 100644 index 0000000..7d5d584 --- /dev/null +++ b/package/rtmpdump/rtmpdump-0001-Fix-override-of-CFLAGS-and-LDFLAGS.patch @@ -0,0 +1,43 @@ +From 3c44f11aefe70f4ed1660a614441bbdd5220e332 Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Sat, 25 Jan 2014 16:14:35 +0100 +Subject: [PATCH] Fix override of CFLAGS and LDFLAGS + +Signed-off-by: Maxime Hadjinlian +--- + Makefile | 4 ++-- + librtmp/Makefile | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index a1595a8..3c1eaba 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,8 +21,8 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) +-LDFLAGS=-Wall $(XLDFLAGS) ++override CFLAGS +=-Wall $(INC) $(DEF) $(OPT) ++override LDFLAGS +=-Wall + + bindir=$(prefix)/bin + sbindir=$(prefix)/sbin +diff --git a/librtmp/Makefile b/librtmp/Makefile +index 74ee3b5..a1f2bbc 100644 +--- a/librtmp/Makefile ++++ b/librtmp/Makefile +@@ -72,8 +72,7 @@ SO_INST=$(SOINST_$(SHARED)) + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) +-LDFLAGS=$(XLDFLAGS) ++override CFLAGS +=-Wall $(INC) $(DEF) $(OPT) $(SO_DEF) + + + OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o +-- +1.8.5.2 +