diff --git a/distcc-3.2_rc1-freedesktop.patch b/distcc-3.2_rc1-freedesktop.patch deleted file mode 100644 index b4333e0..0000000 --- a/distcc-3.2_rc1-freedesktop.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: distcc-3.3.3/Makefile.in -=================================================================== ---- distcc-3.3.3.orig/Makefile.in -+++ distcc-3.3.3/Makefile.in -@@ -52,13 +52,14 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datadir)/pixmaps -+desktopdir = $(datadir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1126,10 +1127,10 @@ install-example: $(example_DOCS) - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png "$(DESTDIR)$(icondir)" || exit 1 -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" || exit 1 - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -Index: distcc-3.3.3/gnome/distccmon-gnome.desktop -=================================================================== ---- distcc-3.3.3.orig/gnome/distccmon-gnome.desktop -+++ distcc-3.3.3/gnome/distccmon-gnome.desktop -@@ -1,6 +1,4 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 - Exec=distccmon-gnome - Name=distcc monitor - Name[sv]=distcc övervakare -@@ -8,9 +6,9 @@ GenericName=Distributed Compile Monitor - GenericName[sv]=Distribuerad kompilerings-övervakare - Comment=Graphical view of distributed compile tasks - Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome-icon - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;Development; - StartupNotify=true -Index: distcc-3.3.3/src/mon-gnome.c -=================================================================== ---- distcc-3.3.3.orig/src/mon-gnome.c -+++ distcc-3.3.3/src/mon-gnome.c -@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwi - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome-icon.png", - NULL); - #endif - diff --git a/distcc-3.2_rc1-gssapi.patch b/distcc-3.2_rc1-gssapi.patch deleted file mode 100644 index 065b573..0000000 --- a/distcc-3.2_rc1-gssapi.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.ac 2011-10-21 13:40:55.000000000 +0900 -+++ b/configure.ac 2011-10-27 18:06:58.938922585 +0900 -@@ -14,6 +14,8 @@ - - AC_CONFIG_HEADERS(src/config.h) - -+PKG_PROG_PKG_CONFIG -+ - # FreeBSD installs its version of libpopt into /usr/local/, but does - # not put that on the default library and header path. - # Solaris doesn't even ship libpopt. We used to add that path if -@@ -503,16 +505,17 @@ - [provide mutual authentication services via the GSS-API])]) - - if test x"$with_auth" = xyes; then -- AC_SEARCH_LIBS([gss_init_sec_context], -- [gssapi gssapi_krb5 gss], -- AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available]) -+ PKG_CHECK_MODULES(GSSAPI, libgssglue, -+ [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available]) -+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ LIBS="$LIBS $GSSAPI_LIBS" - AUTH_COMMON_OBJS="src/auth_common.o" - AUTH_DISTCC_OBJS="src/auth_distcc.o" -- AUTH_DISTCCD_OBJS="src/auth_distccd.o", -- AC_MSG_FAILURE([--with-auth was given but no GSS-API library found]) -+ AUTH_DISTCCD_OBJS="src/auth_distccd.o"], -+ [AC_MSG_FAILURE([--with-auth was given but no GSS-API library found]) - AUTH_COMMON_OBJS="" - AUTH_DISTCC_OBJS="" -- AUTH_DISTCCD_OBJS="") -+ AUTH_DISTCCD_OBJS=""]) - fi - - AC_SUBST(AUTH_COMMON_OBJS) diff --git a/distcc-3.3.3.tar.gz b/distcc-3.3.3.tar.gz deleted file mode 100644 index a9a2734..0000000 --- a/distcc-3.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7f37d314704fbaf006d747514ff6e4d0d722102ef7d2aea132f97cf170f5169 -size 1000021 diff --git a/distcc-3.3.5.tar.gz b/distcc-3.3.5.tar.gz new file mode 100644 index 0000000..4c0022b --- /dev/null +++ b/distcc-3.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13a4b3ce49dfc853a3de550f6ccac583413946b3a2fa778ddf503a9edc8059b0 +size 1002090 diff --git a/distcc.changes b/distcc.changes index b5d2e91..fe0b7c6 100644 --- a/distcc.changes +++ b/distcc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Feb 28 17:29:07 UTC 2021 - Dirk Müller + +- update to 3.3.5: + * Fix build on OSX + * Fix build when using optional features AND those optional libraries decided + to build against libsystemd (not sure which one, but it doesn't matter). + * Python 3.8 compatibility issues + * drop distcc-3.2_rc1-freedesktop.patch distcc-3.2_rc1-gssapi.patch: obsolete + * drop gcc-10-no-common.patch: upstream + ------------------------------------------------------------------- Mon Jun 8 11:25:04 UTC 2020 - Dirk Mueller diff --git a/distcc.spec b/distcc.spec index 893e1be..01c8547 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,7 +1,7 @@ # # spec file for package distcc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: distcc -Version: 3.3.3 +Version: 3.3.5 Release: 0 Summary: A distributed C/C++ compiler License: GPL-2.0-or-later @@ -30,10 +30,7 @@ URL: https://github.com/distcc/distcc Source0: https://github.com/distcc/distcc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: distccd.sysconfig Source2: distccd.service -Patch1: distcc-3.2_rc1-freedesktop.patch -Patch2: distcc-3.2_rc1-gssapi.patch Patch3: distcc-3.2_rc1-python.patch -Patch4: gcc-10-no-common.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: binutils-devel @@ -46,6 +43,7 @@ BuildRequires: python BuildRequires: update-desktop-files BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(libgssglue) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(python3) @@ -100,11 +98,7 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" --with-gtk \ --with-avahi \ --with-auth -# For some reason CC is not propagated to makefile and we get empty string -sed -i \ - -e 's:CC = :CC = cc:' \ - Makefile -make %{?_smp_mflags} +%make_build %install %make_install docdir=%{_docdir}/%{name} @@ -184,6 +178,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}/{INSTALL,COPYING} %files gui %{_bindir}/distccmon-gnome %{_datadir}/applications/distccmon-gnome.desktop -%{_datadir}/pixmaps/distccmon-gnome-icon.png +%{_datadir}/pixmaps/distccmon-gnome.png %changelog diff --git a/gcc-10-no-common.patch b/gcc-10-no-common.patch deleted file mode 100644 index 708b849..0000000 --- a/gcc-10-no-common.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001 -From: Romain Geissler -Date: Mon, 27 Jan 2020 09:28:43 +0000 -Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf - https://gcc.gnu.org/gcc-10/porting_to.html) - -This fixes the following link error I see when I use the latest gcc 10 -git branch: -/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 -/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 -collect2: error: ld returned 1 exit status ---- - src/stats.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stats.h b/src/stats.h -index 9bde285..74d4690 100644 ---- a/src/stats.h -+++ b/src/stats.h -@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, - STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, - STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; - --const char *stats_text[20]; -+extern const char *stats_text[20]; - - int dcc_stats_init(void); - void dcc_stats_init_kid(void);