From patchwork Sun Jul 31 10:35:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 654343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s2Jkz06bFz9syB for ; Sun, 31 Jul 2016 20:35:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A755188585; Sun, 31 Jul 2016 10:35:19 +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 DB9ilmKofHEt; Sun, 31 Jul 2016 10:35:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EB5F58770C; Sun, 31 Jul 2016 10:35:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B543A1C08E3 for ; Sun, 31 Jul 2016 10:35:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AEB4C876F8 for ; Sun, 31 Jul 2016 10:35:17 +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 EsRpi9G_710O for ; Sun, 31 Jul 2016 10:35:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2FCAE87757 for ; Sun, 31 Jul 2016 10:35:16 +0000 (UTC) Received: from fwd07.aul.t-online.de (fwd07.aul.t-online.de [172.20.27.150]) by mailout09.t-online.de (Postfix) with SMTP id 36965427C344 for ; Sun, 31 Jul 2016 12:35:13 +0200 (CEST) Received: from fli4l.lan.fli4l (VO4UNOZaYhf5bfDiGTFT1tz1C8Fm0js0MMx79CWRRGpil7mW3WgF9af6GSai65qg0N@[84.178.240.184]) by fwd07.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1bTo5L-2vNP4C0; Sun, 31 Jul 2016 12:35:07 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:43784 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.87) (envelope-from ) id 1bTo5K-0005wE-Gi; Sun, 31 Jul 2016 12:35:06 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 31 Jul 2016 12:35:05 +0200 Message-Id: <1469961305-25334-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.8.1 X-ID: VO4UNOZaYhf5bfDiGTFT1tz1C8Fm0js0MMx79CWRRGpil7mW3WgF9af6GSai65qg0N X-TOI-MSGID: 2d7ae035-7186-4f4e-965d-86dad50442cd Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v2 1/1] package/transmission: Fix compilation when using system libminiupnpc with libutp disabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Fixes http://autobuild.buildroot.net/results/63a/63a3caac7e1e7b5ab268d9be3cd77617df619659/ Signed-off-by: Bernd Kuhls --- v2: updated patch (Yann) package/transmission/0004-fix-utp-include.patch | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/transmission/0004-fix-utp-include.patch diff --git a/package/transmission/0004-fix-utp-include.patch b/package/transmission/0004-fix-utp-include.patch new file mode 100644 index 0000000..3613024 --- /dev/null +++ b/package/transmission/0004-fix-utp-include.patch @@ -0,0 +1,47 @@ +Fix compilation when using system libminiupnpc with libutp disabled + +If transmission uses its own copy of libminiupnpc in third-party/ then +the configure script adds that path to CFLAGS: +https://trac.transmissionbt.com/browser/trunk/configure.ac#L455 + +This patch is also added if transmission uses its own copy of libutp: +https://trac.transmissionbt.com/browser/trunk/configure.ac#L349 + +But if a system-provided libminiupnpc is used and utp-support is +disabled using --disable-utp the result is a build error, detected by +buildroot autobuilders: +http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log + +net.c:40:24: fatal error: libutp/utp.h: No such file or directory + +Patch proposed by Yann E. MORIN: +http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html + +Patch sent upstream: https://trac.transmissionbt.com/ticket/9554 +(awaiting moderation at the time of writing) + +Signed-off-by: Bernd Kuhls + +diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac +--- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 ++++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200 +@@ -358,6 +358,10 @@ + else + AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") + fi ++else ++ # For the system libminiupnpc with UTC disabled, ++ # point to our bundled UTP headers ++ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" + fi + AC_SUBST(LIBUTP_CFLAGS) + AC_SUBST(LIBUTP_LIBS) +@@ -457,7 +461,7 @@ + LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" + else + AC_DEFINE([SYSTEM_MINIUPNP]) +- LIBUPNP_CFLAGS="" ++ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}" + LIBUPNP_LIBS="-lminiupnpc" + LIBUPNP_LIBS_QT="-lminiupnpc" + fi