diff options
| -rw-r--r-- | meta/recipes-devtools/distcc/distcc_3.2.bb (renamed from meta/recipes-devtools/distcc/distcc_3.1.bb) | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/distcc/files/separatebuilddir.patch | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb index f8879c87c5..600ec96673 100644 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ b/meta/recipes-devtools/distcc/distcc_3.2.bb | |||
| @@ -5,7 +5,7 @@ SECTION = "devel" | |||
| 5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 7 | 7 | ||
| 8 | DEPENDS = "avahi" | 8 | DEPENDS = "avahi binutils" |
| 9 | 9 | ||
| 10 | GTKCONFIG = "gtk" | 10 | GTKCONFIG = "gtk" |
| 11 | GTKCONFIG_libc-uclibc = "" | 11 | GTKCONFIG_libc-uclibc = "" |
| @@ -17,19 +17,19 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" | |||
| 17 | 17 | ||
| 18 | RRECOMMENDS_${PN} = "avahi-daemon" | 18 | RRECOMMENDS_${PN} = "avahi-daemon" |
| 19 | 19 | ||
| 20 | SRC_URI = "git://github.com/distcc/distcc.git \ | 20 | SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ |
| 21 | file://separatebuilddir.patch \ | 21 | file://separatebuilddir.patch \ |
| 22 | file://0001-zeroconf-Include-fcntl.h.patch \ | 22 | file://0001-zeroconf-Include-fcntl.h.patch \ |
| 23 | file://default \ | 23 | file://default \ |
| 24 | file://distccmon-gnome.desktop \ | 24 | file://distccmon-gnome.desktop \ |
| 25 | file://distcc \ | 25 | file://distcc \ |
| 26 | file://distcc.service" | 26 | file://distcc.service" |
| 27 | SRCREV = "9a172d3d20042754a30c0cd9a5d63fd1a8120c31" | 27 | SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" |
| 28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
| 29 | 29 | ||
| 30 | inherit autotools pkgconfig update-rc.d useradd systemd | 30 | inherit autotools pkgconfig update-rc.d useradd systemd |
| 31 | 31 | ||
| 32 | EXTRA_OECONF += "--disable-Werror PYTHON=/dev/null" | 32 | EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" |
| 33 | 33 | ||
| 34 | USERADD_PACKAGES = "${PN}" | 34 | USERADD_PACKAGES = "${PN}" |
| 35 | USERADD_PARAM_${PN} = "--system \ | 35 | USERADD_PARAM_${PN} = "--system \ |
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch index b9e3e42ddf..7580b5584b 100644 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch | |||
| @@ -6,16 +6,16 @@ RP 2013/3/8 | |||
| 6 | 6 | ||
| 7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
| 8 | 8 | ||
| 9 | Index: distcc-3.1/Makefile.in | 9 | Index: git/Makefile.in |
| 10 | =================================================================== | 10 | =================================================================== |
| 11 | --- distcc-3.1.orig/Makefile.in 2008-12-02 21:50:31.000000000 +0000 | 11 | --- git.orig/Makefile.in |
| 12 | +++ distcc-3.1/Makefile.in 2013-03-08 10:49:24.224400937 +0000 | 12 | +++ git/Makefile.in |
| 13 | @@ -1088,7 +1088,7 @@ | 13 | @@ -1117,7 +1117,7 @@ install-example: $(example_DOCS) |
| 14 | install-gnome-data: $(gnome_data) | 14 | install-gnome-data: $(gnome_data) |
| 15 | $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" | 15 | $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" |
| 16 | for p in $(gnome_data); do \ | 16 | for p in $(gnome_data); do \ |
| 17 | - $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ | 17 | - $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ |
| 18 | + $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ | 18 | + $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ |
| 19 | done | 19 | done |
| 20 | 20 | ||
| 21 | install-conf: $(conf_files) $(default_files) | 21 | install-conf: $(conf_files) $(default_files) |
