1*4882a593SmuzhiyunFix compilation when using system libminiupnpc with libutp disabled 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunIf transmission uses its own copy of libminiupnpc in third-party/ then 4*4882a593Smuzhiyunthe configure script adds that path to CFLAGS: 5*4882a593Smuzhiyunhttps://trac.transmissionbt.com/browser/trunk/configure.ac#L455 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThis path is also added if transmission uses its own copy of libutp: 8*4882a593Smuzhiyunhttps://trac.transmissionbt.com/browser/trunk/configure.ac#L349 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunBut if a system-provided libminiupnpc is used and utp-support is 11*4882a593Smuzhiyundisabled using --disable-utp the result is a build error, detected by 12*4882a593Smuzhiyunbuildroot autobuilders: 13*4882a593Smuzhiyunhttp://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log 14*4882a593Smuzhiyun 15*4882a593Smuzhiyunnet.c:40:24: fatal error: libutp/utp.h: No such file or directory 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunPatch proposed by Yann E. MORIN: 18*4882a593Smuzhiyunhttp://lists.busybox.net/pipermail/buildroot/2016-July/167896.html 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunPatch sent upstream: https://trac.transmissionbt.com/ticket/6163 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <berndkuhls@hotmail.com> 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac 25*4882a593Smuzhiyun--- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 26*4882a593Smuzhiyun+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200 27*4882a593Smuzhiyun@@ -358,6 +358,10 @@ 28*4882a593Smuzhiyun else 29*4882a593Smuzhiyun AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") 30*4882a593Smuzhiyun fi 31*4882a593Smuzhiyun+else 32*4882a593Smuzhiyun+ # For the system libminiupnpc with UTC disabled, 33*4882a593Smuzhiyun+ # point to our bundled UTP headers 34*4882a593Smuzhiyun+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" 35*4882a593Smuzhiyun fi 36*4882a593Smuzhiyun AC_SUBST(LIBUTP_CFLAGS) 37*4882a593Smuzhiyun AC_SUBST(LIBUTP_LIBS) 38*4882a593Smuzhiyun@@ -457,7 +461,7 @@ 39*4882a593Smuzhiyun LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" 40*4882a593Smuzhiyun else 41*4882a593Smuzhiyun AC_DEFINE([SYSTEM_MINIUPNP]) 42*4882a593Smuzhiyun- LIBUPNP_CFLAGS="" 43*4882a593Smuzhiyun+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}" 44*4882a593Smuzhiyun LIBUPNP_LIBS="-lminiupnpc" 45*4882a593Smuzhiyun LIBUPNP_LIBS_QT="-lminiupnpc" 46*4882a593Smuzhiyun fi 47