Skip to contentSkip to conversation

package/gamin: drop package

PATCH Applied Fabrice Fontaine 2 participants 2 messages Jul 23, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gamin: drop package

As advocated by Thomas Petazzoni [1], drop gamin as package is not maintained anymore.

This will also avoid the following build failure with gcc 14:

gam_api.c: In function 'gamin_get_user_name':
gam_api.c:123:9: error: implicit declaration of function 'strncpy' [-Wimplicit-function-declaration]

  123 |         strncpy(user_name, pw->pw_name, 99);
      |         ^~~~~~~

[1] https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Fixes:
- http://autobuild.buildroot.org/results/b267f53ba6035d256c013dbbbbd1bcdfe0ef111f

---
 .checkpackageignore                           |  3 -
 Config.in.legacy                              |  7 +++
 package/gamin/0001-no-abstract-sockets.patch  | 61 -------------------
 package/gamin/0002-no-const-return.patch      | 57 -----------------
 ...x-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch | 39 ------------
 package/gamin/Config.in                       | 14 -----
 package/gamin/gamin.hash                      |  3 -
 package/gamin/gamin.mk                        | 21 -------
 package/samba4/samba4.mk                      |  8 +--
 9 files changed, 8 insertions(+), 205 deletions(-)
 delete mode 100644 package/gamin/0001-no-abstract-sockets.patch
 delete mode 100644 package/gamin/0002-no-const-return.patch
 delete mode 100644 package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
 delete mode 100644 package/gamin/Config.in
 delete mode 100644 package/gamin/gamin.hash
 delete mode 100644 package/gamin/gamin.mk
.checkpackageignore +0 -3
index b042873aa3..a4492ae09b 100644
@@ -562,9 +562,6 @@ package/ftop/0001-overflow.patch lib_patch.Upstream
 package/fwts/0001-build-do-not-use-Werror.patch lib_patch.Upstream
 package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch lib_patch.Upstream
 package/fxload/0001-fix-static-build.patch lib_patch.Upstream
-package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream
-package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream
-package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream
 package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream
 package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream
 package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream
Config.in.legacy +7 -0
index 414a14944e..94ac60b668 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2024.08"
 
+config BR2_PACKAGE_GAMIN
+	bool "gamin package removed"
+	select BR2_LEGACY
+	help
+	  The gamin package was removed as it is not maintained
+	  anymore (no commit since 2016).
+
 config BR2_PACKAGE_CAIRO_SVG
 	bool "cairo svg support"
 	select BR2_LEGACY
package/gamin/0001-no-abstract-sockets.patch deleted +0 -61

61 lines not on this page · raw message

package/gamin/0002-no-const-return.patch deleted +0 -57

57 lines not on this page · raw message

package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch deleted +0 -39
deleted file mode 100644
index b5f2e6c521..0000000000
@@ -1,39 +0,0 @@
-Fix missing PTHREAD_MUTEX_RECURSIVE_NP
-
-The musl C library does not provide the non portable
-PTHREAD_MUTEX_RECURSIVE_NP. In addition, uClibc does not define it as
-a #define, but as an enum value, so doing a #if defined() check
-doesn't work properly. Instead, add a AC_CHECK_DECL() autoconf check.
-
-Signed-off-by: Baruch Siach <[email protected]>
-[Thomas: switch to an autoconf check.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -294,6 +294,10 @@
- 	   AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
- 	   AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
- 	   WITH_THREADS="1"]))
-+
-+    AC_CHECK_DECL([PTHREAD_MUTEX_RECURSIVE_NP],
-+		[AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], [], [whether HAVE_PTHREAD_MUTEX_RECURSIVE_NP is defined])],
-+		[], [#include <pthread.h>])
- fi
- 
- dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
-Index: b/libgamin/gam_data.c
-===================================================================
---- a/libgamin/gam_data.c
-+++ b/libgamin/gam_data.c
-@@ -470,7 +470,7 @@
-     }
-     if (is_threaded > 0) {
- 	pthread_mutexattr_init(&attr);
--#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP)
-+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP)
- 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- #else
- 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
package/gamin/Config.in deleted +0 -14
deleted file mode 100644
index 55e037a4a4..0000000000
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_GAMIN
-	bool "gamin"
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # glib2
-	select BR2_PACKAGE_LIBGLIB2
-	help
-	  the File Alteration Monitor
-
-	  http://www.gnome.org/~veillard/gamin/sources
-
-comment "gamin needs a toolchain w/ wchar, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/gamin/gamin.hash deleted +0 -3
deleted file mode 100644
index e28660dded..0000000000
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1  gamin-0.1.10.tar.gz
-sha256  7f9ffc38883325f011f331a9d6074ffd0175fbcecd57f69c577fb3845f333876  COPYING
package/gamin/gamin.mk deleted +0 -21
deleted file mode 100644
index 4621b1646f..0000000000
@@ -1,21 +0,0 @@
-################################################################################
-#
-# gamin
-#
-################################################################################
-
-GAMIN_VERSION = 0.1.10
-GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
-GAMIN_AUTORECONF = YES
-GAMIN_INSTALL_STAGING = YES
-GAMIN_LICENSE = LGPL-2.0+
-GAMIN_LICENSE_FILES = COPYING
-
-# python support broken
-GAMIN_CONF_OPTS += --without-python
-
-GAMIN_CONF_ENV = have_abstract_sockets=no
-
-GAMIN_DEPENDENCIES = libglib2
-
-$(eval $(autotools-package))
package/samba4/samba4.mk +1 -7
index 126a572c91..c9f025134a 100644
@@ -79,13 +79,6 @@ else
 SAMBA4_CONF_OPTS += --disable-avahi
 endif
 
-ifeq ($(BR2_PACKAGE_GAMIN),y)
-SAMBA4_CONF_OPTS += --with-fam
-SAMBA4_DEPENDENCIES += gamin
-else
-SAMBA4_CONF_OPTS += --without-fam
-endif
-
 ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
 SAMBA4_CONF_OPTS += --with-libarchive
 SAMBA4_DEPENDENCIES += libarchive
@@ -143,6 +136,7 @@ define SAMBA4_CONFIGURE_CMDS
 			--disable-rpath \
 			--disable-rpath-install \
 			--disable-iprint \
+			--without-fam \
 			--without-pam \
 			--without-dmapi \
 			--without-gpgme \
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 25 lines · On Tue, 23 Jul 2024 12:48:41 +0200 Fabrice Fontaine…

As advocated by Thomas Petazzoni [1], drop gamin as package is not maintained anymore.

This will also avoid the following build failure with gcc 14:

gam_api.c: In function 'gamin_get_user_name':
gam_api.c:123:9: error: implicit declaration of function 'strncpy' [-Wimplicit-function-declaration]

  123 |         strncpy(user_name, pw->pw_name, 99);
      |         ^~~~~~~

[1] https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Fixes:
- http://autobuild.buildroot.org/results/b267f53ba6035d256c013dbbbbd1bcdfe0ef111f

---
 .checkpackageignore                           |  3 -
 Config.in.legacy                              |  7 +++
 package/gamin/0001-no-abstract-sockets.patch  | 61 -------------------
 package/gamin/0002-no-const-return.patch      | 57 -----------------
 ...x-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch | 39 ------------
 package/gamin/Config.in                       | 14 -----
 package/gamin/gamin.hash                      |  3 -
 package/gamin/gamin.mk                        | 21 -------
Quoted 8 lines
 package/samba4/samba4.mk                      |  8 +--
 9 files changed, 8 insertions(+), 205 deletions(-)
 delete mode 100644 package/gamin/0001-no-abstract-sockets.patch
 delete mode 100644 package/gamin/0002-no-const-return.patch
 delete mode 100644 package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
 delete mode 100644 package/gamin/Config.in
 delete mode 100644 package/gamin/gamin.hash
 delete mode 100644 package/gamin/gamin.mk

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot