distcc: fix makefile parameter order

When linking with gcc, the parameter is read from left to write, if *.o
calls a function contained in libxxx, the parameter order should be

"gcc ... *.o -lxxx".

This commit fixes the problem in distcc.

(From OE-Core rev: 782499eaa817f1beecc0aea5bfa075196f8e2a53)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2011-07-26 08:26:08 +08:00 committed by Richard Purdie
parent 9f54793089
commit 54da9dcc85
2 changed files with 22 additions and 1 deletions

View File

@ -4,7 +4,7 @@ compilation of C/C++/ObjC code across machines on a network."
SECTION = "devel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
PR = "r6"
PR = "r7"
DEPENDS = "avahi ${GTKDEP}"
GTKDEP_libc-uclibc = ""
@ -16,6 +16,7 @@ RRECOMMENDS_${PN} = "avahi-daemon"
# http://0pointer.de/public/distcc-avahi.patch
SRC_URI = "http://distcc.googlecode.com/files/${PN}-${PV}.tar.bz2 \
file://distcc-avahi.patch \
file://makefile-param-order.patch \
file://default \
file://distccmon-gnome.desktop \
file://distcc"

View File

@ -0,0 +1,20 @@
distcc: Put the "-lLIB" parameter in the end of the gcc command.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Upstream-Status: Pending
diff -ruN distcc-2.18.3-orig/Makefile.in distcc-2.18.3/Makefile.in
--- distcc-2.18.3-orig/Makefile.in 2011-07-25 16:43:21.000000000 +0800
+++ distcc-2.18.3/Makefile.in 2011-07-25 16:45:39.000000000 +0800
@@ -378,8 +378,8 @@
distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) \
- $(GNOME_CFLAGS) $(GNOME_LIBS) \
- $(mon_obj) $(gnome_obj)
+ $(GNOME_CFLAGS) \
+ $(mon_obj) $(gnome_obj) $(GNOME_LIBS)
## Dist targets