diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-07-26 08:26:08 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 15:44:23 +0100 |
| commit | 782499eaa817f1beecc0aea5bfa075196f8e2a53 (patch) | |
| tree | 5d2ad708a61e366de48aaf26994114dcff250c78 | |
| parent | 3212029f0967dd353fec8cc147d2b95031d1018a (diff) | |
| download | openembedded-core-782499eaa817f1beecc0aea5bfa075196f8e2a53.tar.gz openembedded-core-782499eaa817f1beecc0aea5bfa075196f8e2a53.tar.bz2 openembedded-core-782499eaa817f1beecc0aea5bfa075196f8e2a53.zip | |
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.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
| -rw-r--r-- | meta/recipes-devtools/distcc/distcc_2.18.3.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/distcc/files/makefile-param-order.patch | 20 |
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." 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" 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 @@ +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 |