Skip to contentSkip to conversation

transmission: fix uTP enabled build with ccache

PATCH New Thomas De Schampheleire 2 participants 2 messages Feb 18, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 transmission: fix uTP enabled build with ccache

Transmission would incorrectly determine the C++ compiler when ccache is enabled, causing a build with uTP to fail at the configure step. This patch adds a patch against transmission, fixing the problem.

---
 package/transmission/transmission-02-fix-cxx-check-with-ccache.patch |  44 ++++++++++
 package/transmission/transmission.mk                                 |   1 +
 2 files changed, 45 insertions(+), 0 deletions(-)
package/transmission/transmission-02-fix-cxx-check-with-ccache.patch new file +44 -0
new file mode 100644
@@ -0,0 +1,44 @@
+transmission: fix incorrect check of CXX when ccache is enabled
+
+When ccache is enabled, the configure script is called with
+CXX="/path/to/ccache /path/to/cxx". The AC_PROG_CXX correctly deals with
+this, but the transmission-specific extra checks on CXX do not. It uses
+AC_CHECK_PROG, which takes the first word of CXX (ccache) only.
+
+This patch removes the seemingly unneeded extra checks, and additionally
+replaces HAVE_CXX=yes/no with a direct check on CXX, as it is only used in
+one place.
+
+Signed-off-by: Thomas De Schampheleire <[email protected]>
+Upstream-status: submitted: https://trac.transmissionbt.com/ticket/5612
+
+---
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,15 +69,6 @@ AC_SUBST(LIBAPPINDICATOR_MINIMUM)
+ 
+ AC_PROG_CC
+ AC_PROG_CXX
+-if test "x$CXX" != "x"; then # CXX is set...
+-  if test -f "$CXX"; then # maybe it's an absolute path passed in env variables...
+-    AC_MSG_CHECKING([for $CXX])
+-    HAVE_CXX="yes"
+-    AC_MSG_RESULT([$HAVE_CXX])
+-  else
+-    AC_CHECK_PROG([HAVE_CXX],[$CXX],[yes],[no])
+-  fi
+-fi
+ AC_C_INLINE
+ if test "x$GCC" = "xyes" ; then
+ 
+@@ -216,7 +207,7 @@ AC_CHECK_LIB([rt],
+ 
+ AC_MSG_CHECKING([?TP])
+ build_utp="no"
+-if test "x$HAVE_CXX" = "xyes" ; then
++if test "x$CXX" != "x" ; then
+     have_utp="yes"
+ else
+     have_utp="no"
package/transmission/transmission.mk +1 -0
@@ -14,6 +14,7 @@ TRANSMISSION_DEPENDENCIES = \
 	libevent \
 	openssl \
 	zlib
+TRANSMISSION_AUTORECONF = YES
 
 TRANSMISSION_CONF_OPT = \
 	--disable-libnotify \
#1 lore raw

PATCH 1/1 transmission: fix uTP enabled build with ccache

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Transmission would incorrectly determine the C++ compiler when ccache is enabled, causing a build with uTP to fail at the configure step. This patch adds a patch against transmission, fixing the problem.

Committed, thanks.

Quoted 1 line

+Upstream-status: submitted: https://trac.transmissionbt.com/ticket/5612

Great, thanks.

Signature · 1 line
Bye, Peter Korsgaard