Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/transmission: Fix compilation when using system libminiupnpc with libutp disabled
Date: Sun, 17 Jul 2016 17:44:36 +0200	[thread overview]
Message-ID: <20160717154436.GI3614@free.fr> (raw)
In-Reply-To: <20160712164247.GB3680@free.fr>

Bernd, All,

On 2016-07-12 18:42 +0200, Yann E. MORIN spake thusly:
> On 2016-07-07 07:13 +0200, Bernd Kuhls spake thusly:
> > Fixes
> > http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/
> > 
> > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> 
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Well, I withdraw this review of mine... :-(

See below...

[--SNIP--]
> > +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-06 22:27:25.809613723 +0200
> > +@@ -333,6 +333,7 @@
> > +     want_utp_default="no"
> > + fi
> > + 
> > ++LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"

So it means that headers from the internal libutp will always be used,
even if an external one is found. This is probably not very good...

Instead, I think the fix is probably something like:

    --- configure.ac(revision 14736)
    +++ configure.a c)(working copy)
    @@ -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

Can you test and respin if OK, please?  Thanks! :-)

Regards,
Yann E. MORIN.

> > + AC_ARG_ENABLE([utp],
> > +               AS_HELP_STRING([--enable-utp],[build ?TP support]),
> > +               [want_utp=${enableval}],
> > +@@ -346,7 +347,6 @@
> > +         AC_DEFINE([WITH_UTP],[1])
> > +         build_utp="system"
> > +     elif test "x$CXX" != "x"; then
> > +-        LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
> > +         LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
> > +         LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
> > +         if test "x$libutp_extra_libs" != "x" ; then
> > -- 
> > 2.8.1
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2016-07-17 15:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-07  5:13 [Buildroot] [PATCH 1/1] package/transmission: Fix compilation when using system libminiupnpc with libutp disabled Bernd Kuhls
2016-07-12 16:42 ` Yann E. MORIN
2016-07-17 15:44   ` Yann E. MORIN [this message]
2016-07-27 21:32     ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160717154436.GI3614@free.fr \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox