summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/distcc
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-07-26 08:26:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:45:49 +0100
commit54da9dcc855690be79762e894eb5c347f2487d8e (patch)
tree7b17692d247a8e3c521ee40845fa45fe56d22a8d /meta/recipes-devtools/distcc
parent9f54793089eb355bb83b8026557f07bfe1cc721f (diff)
downloadpoky-54da9dcc855690be79762e894eb5c347f2487d8e.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/distcc')
-rw-r--r--meta/recipes-devtools/distcc/distcc_2.18.3.bb3
-rw-r--r--meta/recipes-devtools/distcc/files/makefile-param-order.patch20
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index ece1b02105..e474cce4c7 100644
--- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
@@ -4,7 +4,7 @@ compilation of C/C++/ObjC code across machines on a network."
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7PR = "r6" 7PR = "r7"
8 8
9DEPENDS = "avahi ${GTKDEP}" 9DEPENDS = "avahi ${GTKDEP}"
10GTKDEP_libc-uclibc = "" 10GTKDEP_libc-uclibc = ""
@@ -16,6 +16,7 @@ RRECOMMENDS_${PN} = "avahi-daemon"
16# http://0pointer.de/public/distcc-avahi.patch 16# http://0pointer.de/public/distcc-avahi.patch
17SRC_URI = "http://distcc.googlecode.com/files/${PN}-${PV}.tar.bz2 \ 17SRC_URI = "http://distcc.googlecode.com/files/${PN}-${PV}.tar.bz2 \
18 file://distcc-avahi.patch \ 18 file://distcc-avahi.patch \
19 file://makefile-param-order.patch \
19 file://default \ 20 file://default \
20 file://distccmon-gnome.desktop \ 21 file://distccmon-gnome.desktop \
21 file://distcc" 22 file://distcc"
diff --git a/meta/recipes-devtools/distcc/files/makefile-param-order.patch b/meta/recipes-devtools/distcc/files/makefile-param-order.patch
new file mode 100644
index 0000000000..fc57414f12
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/makefile-param-order.patch
@@ -0,0 +1,20 @@
1distcc: Put the "-lLIB" parameter in the end of the gcc command.
2
3Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
4
5Upstream-Status: Pending
6
7diff -ruN distcc-2.18.3-orig/Makefile.in distcc-2.18.3/Makefile.in
8--- distcc-2.18.3-orig/Makefile.in 2011-07-25 16:43:21.000000000 +0800
9+++ distcc-2.18.3/Makefile.in 2011-07-25 16:45:39.000000000 +0800
10@@ -378,8 +378,8 @@
11
12 distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
13 $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) \
14- $(GNOME_CFLAGS) $(GNOME_LIBS) \
15- $(mon_obj) $(gnome_obj)
16+ $(GNOME_CFLAGS) \
17+ $(mon_obj) $(gnome_obj) $(GNOME_LIBS)
18
19
20 ## Dist targets