diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/distcc/distcc_3.3.5.bb (renamed from meta/recipes-devtools/distcc/distcc_3.3.3.bb) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch | 34 | ||||
-rw-r--r-- | meta/recipes-devtools/distcc/files/fix-gnome.patch | 122 | ||||
-rw-r--r-- | meta/recipes-devtools/distcc/files/separatebuilddir.patch | 33 |
4 files changed, 4 insertions, 194 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.5.bb index d92b9c3046..d2ea9c8a6a 100644 --- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/meta/recipes-devtools/distcc/distcc_3.3.5.bb | |||
@@ -15,14 +15,13 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" | |||
15 | RRECOMMENDS_${PN}-server = "avahi-daemon" | 15 | RRECOMMENDS_${PN}-server = "avahi-daemon" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/distcc/distcc.git \ | 17 | SRC_URI = "git://github.com/distcc/distcc.git \ |
18 | file://fix-gnome.patch \ | ||
19 | file://separatebuilddir.patch \ | ||
20 | file://0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch \ | ||
21 | file://default \ | 18 | file://default \ |
22 | file://distcc \ | 19 | file://distcc \ |
23 | file://distcc.service" | 20 | file://distcc.service \ |
24 | SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae" | 21 | " |
22 | SRCREV = "8572e2a1af39e69b2a2d74622fed6d2dd7dca9b7" | ||
25 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | ||
26 | 25 | ||
27 | inherit autotools pkgconfig update-rc.d useradd systemd | 26 | inherit autotools pkgconfig update-rc.d useradd systemd |
28 | 27 | ||
diff --git a/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch b/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch deleted file mode 100644 index 86c07c11f8..0000000000 --- a/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 98530865795300008fe06bb647a6fc2dddfc7967 Mon Sep 17 00:00:00 2001 | ||
2 | From: Romain Geissler <romain.geissler@amadeus.com> | ||
3 | Date: Mon, 27 Jan 2020 09:28:43 +0000 | ||
4 | Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf | ||
5 | https://gcc.gnu.org/gcc-10/porting_to.html) | ||
6 | |||
7 | This fixes the following link error I see when I use the latest gcc 10 | ||
8 | git branch: | ||
9 | /opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here | ||
10 | /opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here | ||
11 | collect2: error: ld returned 1 exit status | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/distcc/distcc/pull/373] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | src/stats.h | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/stats.h b/src/stats.h | ||
20 | index 9bde285..74d4690 100644 | ||
21 | --- a/src/stats.h | ||
22 | +++ b/src/stats.h | ||
23 | @@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, | ||
24 | STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, | ||
25 | STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; | ||
26 | |||
27 | -const char *stats_text[20]; | ||
28 | +extern const char *stats_text[20]; | ||
29 | |||
30 | int dcc_stats_init(void); | ||
31 | void dcc_stats_init_kid(void); | ||
32 | -- | ||
33 | 2.28.0 | ||
34 | |||
diff --git a/meta/recipes-devtools/distcc/files/fix-gnome.patch b/meta/recipes-devtools/distcc/files/fix-gnome.patch deleted file mode 100644 index f1f5ed1a9f..0000000000 --- a/meta/recipes-devtools/distcc/files/fix-gnome.patch +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://github.com/distcc/distcc/pull/319] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 2faacc2be8d7eeee0a3f66d88fedd1d3ab11070e Mon Sep 17 00:00:00 2001 | ||
5 | From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> | ||
6 | Date: Sat, 8 Dec 2018 12:50:07 +0100 | ||
7 | Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install | ||
8 | |||
9 | Update the .desktop file and install rules for distccmon-gnome to | ||
10 | conform to the freedesktop.org specifications. More specifically: | ||
11 | |||
12 | - update to version 1.0 of the spec | ||
13 | - remove obsolete 'Encoding' key | ||
14 | - remove obsolete 'Application' category and add recommended 'GTK' | ||
15 | - install icon file to the correct directory | ||
16 | - strip suffix from desktop file (specifying it is deprecated) | ||
17 | - while at it, remove redundant '-icon' from the filename | ||
18 | - install desktop file to the correct directory | ||
19 | --- | ||
20 | Makefile.in | 18 ++++++++++-------- | ||
21 | gnome/distccmon-gnome.desktop | 7 +++---- | ||
22 | ...mon-gnome-icon.png => distccmon-gnome.png} | Bin | ||
23 | src/mon-gnome.c | 2 +- | ||
24 | 4 files changed, 14 insertions(+), 13 deletions(-) | ||
25 | rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) | ||
26 | |||
27 | diff --git a/Makefile.in b/Makefile.in | ||
28 | index 6e1e467..1106559 100644 | ||
29 | --- a/Makefile.in | ||
30 | +++ b/Makefile.in | ||
31 | @@ -52,13 +52,14 @@ mandir = @mandir@ | ||
32 | includedir = @includedir@ | ||
33 | oldincludedir = /usr/include | ||
34 | docdir = @docdir@ | ||
35 | -pkgdatadir = $(datadir)/@PACKAGE_NAME@ | ||
36 | +icondir = $(datarootdir)/pixmaps | ||
37 | +desktopdir = $(datarootdir)/applications | ||
38 | |||
39 | include_server_builddir = $(builddir)/_include_server | ||
40 | |||
41 | # These must be done from here, not from autoconf, because they can | ||
42 | # contain variable expansions written in Make syntax. Ew. | ||
43 | -DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" | ||
44 | +DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" | ||
45 | |||
46 | # arguments to pkgconfig | ||
47 | GNOME_PACKAGES = @GNOME_PACKAGES@ | ||
48 | @@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ | ||
49 | man/lsdistcc_1.html man/pump_1.html man/include_server_1.html | ||
50 | MEN = $(man1_MEN) | ||
51 | |||
52 | -gnome_data = gnome/distccmon-gnome-icon.png \ | ||
53 | +gnome_data = gnome/distccmon-gnome.png \ | ||
54 | gnome/distccmon-gnome.desktop | ||
55 | |||
56 | popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ | ||
57 | @@ -1033,7 +1034,8 @@ showpaths: | ||
58 | @echo " programs $(DESTDIR)$(bindir)" | ||
59 | @echo " sbin programs $(DESTDIR)$(sbindir)" | ||
60 | @echo " system configuration $(DESTDIR)$(sysconfdir)" | ||
61 | - @echo " shared data files $(DESTDIR)$(pkgdatadir)" | ||
62 | + @echo " icon file $(DESTDIR)$(icondir)" | ||
63 | + @echo " application file $(DESTDIR)$(desktopdir)" | ||
64 | |||
65 | |||
66 | # install-sh can't handle multiple arguments, but we don't need any | ||
67 | @@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) | ||
68 | done | ||
69 | |||
70 | install-gnome-data: $(gnome_data) | ||
71 | - $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" | ||
72 | - for p in $(gnome_data); do \ | ||
73 | - $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ | ||
74 | - done | ||
75 | + $(mkinstalldirs) "$(DESTDIR)$(icondir)" | ||
76 | + $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" | ||
77 | + $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" | ||
78 | + $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" | ||
79 | |||
80 | install-conf: $(conf_files) $(default_files) | ||
81 | $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" | ||
82 | diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop | ||
83 | index bd1fa26..7205f5e 100644 | ||
84 | --- a/gnome/distccmon-gnome.desktop | ||
85 | +++ b/gnome/distccmon-gnome.desktop | ||
86 | @@ -1,6 +1,5 @@ | ||
87 | [Desktop Entry] | ||
88 | -Version=0.9.4 | ||
89 | -Encoding=UTF-8 | ||
90 | +Version=1.0 | ||
91 | Exec=distccmon-gnome | ||
92 | Name=distcc monitor | ||
93 | Name[sv]=distcc övervakare | ||
94 | @@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor | ||
95 | GenericName[sv]=Distribuerad kompilerings-övervakare | ||
96 | Comment=Graphical view of distributed compile tasks | ||
97 | Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter | ||
98 | -Icon=distccmon-gnome-icon.png | ||
99 | +Icon=distccmon-gnome | ||
100 | TryExec=distccmon-gnome | ||
101 | Terminal=false | ||
102 | Type=Application | ||
103 | -Categories=GNOME;Application;Development; | ||
104 | +Categories=GNOME;GTK;Development; | ||
105 | StartupNotify=true | ||
106 | diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png | ||
107 | similarity index 100% | ||
108 | rename from gnome/distccmon-gnome-icon.png | ||
109 | rename to gnome/distccmon-gnome.png | ||
110 | diff --git a/src/mon-gnome.c b/src/mon-gnome.c | ||
111 | index 24681d0..bfc286d 100644 | ||
112 | --- a/src/mon-gnome.c | ||
113 | +++ b/src/mon-gnome.c | ||
114 | @@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) | ||
115 | |||
116 | #if GTK_CHECK_VERSION(2,2,0) | ||
117 | gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), | ||
118 | - PKGDATADIR "/distccmon-gnome-icon.png", | ||
119 | + ICONDIR "/distccmon-gnome.png", | ||
120 | NULL); | ||
121 | #endif | ||
122 | |||
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch deleted file mode 100644 index c8da9d51c3..0000000000 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 17 Sep 2019 13:04:22 +0100 | ||
7 | Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is | ||
8 | enabled | ||
9 | |||
10 | The install command doesn't use $(srcdir) so out-of-tree builds fail. | ||
11 | |||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
13 | --- | ||
14 | Makefile.in | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | index 123054f..b9ce974 100644 | ||
19 | --- a/Makefile.in | ||
20 | +++ b/Makefile.in | ||
21 | @@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) | ||
22 | install-gnome-data: $(gnome_data) | ||
23 | $(mkinstalldirs) "$(DESTDIR)$(icondir)" | ||
24 | $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" | ||
25 | - $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" | ||
26 | - $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" | ||
27 | + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" | ||
28 | + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" | ||
29 | |||
30 | install-conf: $(conf_files) $(default_files) | ||
31 | $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" | ||
32 | -- | ||
33 | 2.20.1 | ||