From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60790)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WsjVw-0000Eg-6Z
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 22:04:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WsjVr-0008Tr-7f
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 22:04:16 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39293)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1WsjVq-0008Qq-VL
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 22:04:11 -0400
Date: Fri, 6 Jun 2014 10:04:18 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20140606020418.GF10963@T430.nay.redhat.com>
References: <CAKKtb+tP-J2sVbR_ZcgOBpu=aC+jDW3E2pUv5BLashL5Ti4TyA@mail.gmail.com>
	<CAFEAcA93K_=TfPC3qTO3wfwxoSPjXqyf3pBEvj2VHU-E2sLwfA@mail.gmail.com>
	<CAKKtb+szAOsdt2po3Yw=51YG-3qQ31rFb8oqD-HiRAgLevvcvg@mail.gmail.com>
	<CAFEAcA9=w1js-ZmeibJTwhxTJUxx3Ea8HG-gbNxO12QL-g2PVA@mail.gmail.com>
	<CAKKtb+uYdHoSLidyadizmm_B29Wiink4-Ozf3yqUeOssKOKQcg@mail.gmail.com>
	<CAFEAcA_8b7eX=oABvL9NuAcVvjSAXS90E012fq1x3FvCHgJstA@mail.gmail.com>
	<5322F612.6070708@redhat.com> <lmprsk$4dv$1@ger.gmane.org>
	<CAFEAcA9ZJix-w1euD+kcsNOKU5V7hPJqKHOn-FD2jEPNOKJ7eA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <CAFEAcA9ZJix-w1euD+kcsNOKU5V7hPJqKHOn-FD2jEPNOKJ7eA@mail.gmail.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] Problems compiling HEAD on Mac OS X 10.9.2
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, Rainer =?iso-8859-1?Q?M=FCller?= <raimue@codingfarm.de>

On Thu, 06/05 17:11, Peter Maydell wrote:
> On 5 June 2014 14:38, Rainer M=FCller <raimue@codingfarm.de> wrote:
> > On 2014-03-14 13:29, Paolo Bonzini wrote:
> >> Il 13/03/2014 19:48, Peter Maydell ha scritto:
> >>> Yep, here we are:
> >>> LIBSSH2_LIBS=3D-L/opt/local/lib -lssh2 -Wl,-headerpad_max_install_n=
ames
> >>> -arch x86_64
> >>> CURL_LIBS=3D-L/opt/local/lib -lcurl
> >>>
> >>> rules.mak is incorrectly reordering the contents of
> >>> these and generating a non-working mess.
> >>
> >> Fam,
> >>
> >> is the $(sort) actually necessary in extract-libs?  It is required i=
n
> >> expand-objs, but duplicate -l options should be harmless.
> >
> > The current master still contains this bug and sorts "-arch x86_64"
> > separately. I doubt the $(sort) does anything useful.
>=20
> Ugh. This was supposed to be fixed by commit 6295b98d7b767c.
> Fam, can you re-check your fix, please?
>=20

I don't understand that fix now, looks like it was moved onto a wrong lis=
t.

Rainer, does this below patch work for you? (we can't duplicate object, s=
o sort
is required there).

Fam

---

diff --git a/rules.mak b/rules.mak
index b12d312..b895859 100644
--- a/rules.mak
+++ b/rules.mak
@@ -23,8 +23,8 @@ QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(*D)/$(*F).d
 QEMU_INCLUDES +=3D -I$(<D) -I$(@D)

 maybe-add =3D $(filter-out $1, $2) $1
-extract-libs =3D $(strip $(sort $(foreach o,$1,$($o-libs))) \
-                  $(foreach o,$(call expand-objs,$1),$($o-libs)))
+extract-libs =3D $(strip $(foreach o,$1,$($o-libs)) \
+                  $(sort $(foreach o,$(call expand-objs,$1),$($o-libs)))=
)
 expand-objs =3D $(strip $(sort $(filter %.o,$1)) \
                   $(foreach o,$(filter %.mo,$1),$($o-objs)) \
                   $(filter-out %.o %.mo,$1))