mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

distcc: clean up the UI install logic

Browse Source 
Remove the local copy of the desktop file, instead apply a patch from upstream
to fix the file. This also fixes the install paths, so update the recipe.

Remove glibc-specific installation as this was due to uclibc failures.

Refresh and submit upstream the out-of-tree build fix.

(From OE-Core rev: f69cb86f4c15497c6324a0e8063f86cc31cfe7aa)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-09-20 12:28:03 +01:00
committed by Richard Purdie
parent 56da8174e7
commit 4503c1c411
4 changed files with 154 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-devtools/distcc/files/separatebuilddir.patch
View File

@@ -1,21 +1,33 @@
When building with a separate build directory, make install fails,
unable to find the gnome_data files. This patch corrects the
patch and ensures the build works in this case.
Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363]
Signed-off-by: Ross Burton <ross.burton@intel.com>
RP 2013/3/8
From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 17 Sep 2019 13:04:22 +0100
Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is
enabled
Upstream-Status: Pending
The install command doesn't use $(srcdir) so out-of-tree builds fail.
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in
+++ git/Makefile.in
@@ -1117,7 +1117,7 @@ install-example: $(example_DOCS)
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 123054f..b9ce974 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1130,8 +1130,8 @@ install-example: $(example_DOCS)
install-gnome-data: $(gnome_data)
$(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
for p in $(gnome_data); do \
- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+ $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
done
$(mkinstalldirs) "$(DESTDIR)$(icondir)"
$(mkinstalldirs) "$(DESTDIR)$(desktopdir)"
- $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)"
- $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)"
+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)"
+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)"
install-conf: $(conf_files) $(default_files)
$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
--
2.20.1