浏览代码

package/dht: fix cmake4 compatibility

The only dependee of dht, transmission, forked dht due to upstream
rejection of cmake support:
https://github.com/jech/dht/pull/50
https://github.com/jech/dht/pull/19

A fix was added to this fork for building with cmake 4.x:
https://github.com/transmission/dht/commits/post-0.27-transmission/

Instead of adding yet another patch to buildroot we switch to the repo
maintained by transmission.

Fixes:
https://autobuild.buildroot.org/results/30339a4fdb9c0b608ca3c5ae0692596b21b2fc3f/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: use "git describe --abbrev=40" format in _VERSION]
Signed-off-by: Julien Olivain <ju.o@free.fr>
Bernd Kuhls 1 月之前
父节点
当前提交
1b5f8d04c8
共有 4 个文件被更改,包括 3 次插入71 次删除
  1. 0 1
      .checkpackageignore
  2. 0 67
      package/dht/0001-cmake.patch
  3. 1 1
      package/dht/dht.hash
  4. 2 2
      package/dht/dht.mk

+ 0 - 1
.checkpackageignore

@@ -386,7 +386,6 @@ package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables
 package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables
 package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables
 package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace
 package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace
 package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables
 package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables
-package/dht/0001-cmake.patch lib_patch.Upstream
 package/dillo/0001-usr-local-include.patch lib_patch.Upstream
 package/dillo/0001-usr-local-include.patch lib_patch.Upstream
 package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream
 package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream
 package/dillo/0004-fix-build-with-gcc-10.patch lib_patch.Upstream
 package/dillo/0004-fix-build-with-gcc-10.patch lib_patch.Upstream

+ 0 - 67
package/dht/0001-cmake.patch

@@ -1,67 +0,0 @@
-From 25e12bb39eea3d433602de6390796fec8a8f3620 Mon Sep 17 00:00:00 2001
-From: Mike Gelfand <mikedld@mikedld.com>
-Date: Sun, 1 Jan 2017 16:23:21 +0300
-Subject: [PATCH] Remove Makefile, add Makefile.am and CMakeLists.txt
-
-Downloaded from transmission repo:
-https://github.com/transmission/dht/commit/25e12bb39eea3d433602de6390796fec8a8f3620
-
-Upstream status: rejected (https://github.com/jech/dht/pull/19)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- CMakeLists.txt |  9 +++++++++
- Makefile       |  9 ---------
- Makefile.am    | 11 +++++++++++
- 3 files changed, 20 insertions(+), 9 deletions(-)
- create mode 100644 CMakeLists.txt
- delete mode 100644 Makefile
- create mode 100644 Makefile.am
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..6d4aa99
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,9 @@
-+cmake_minimum_required(VERSION 2.8)
-+project(dht C)
-+
-+add_library(${PROJECT_NAME} STATIC
-+    dht.c
-+)
-+
-+install(TARGETS ${PROJECT_NAME} DESTINATION lib)
-+install(FILES dht.h DESTINATION include/dht)
-diff --git a/Makefile b/Makefile
-deleted file mode 100644
-index e012945..0000000
---- a/Makefile
-+++ /dev/null
-@@ -1,9 +0,0 @@
--CFLAGS = -g -Wall
--LDLIBS = -lcrypt
--
--dht-example: dht-example.o dht.o
--
--all: dht-example
--
--clean:
--	-rm -f dht-example dht-example.o dht-example.id dht.o *~ core
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..2dba648
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,11 @@
-+AM_CFLAGS = @PTHREAD_CFLAGS@
-+
-+noinst_LIBRARIES = libdht.a
-+libdht_a_SOURCES = dht.c
-+libdht_a_DEPENDENCIES = $(builddir)/include/dht
-+noinst_HEADERS = dht.h
-+EXTRA_DIST = CHANGES CMakeLists.txt dht-example.c LICENCE README
-+
-+$(builddir)/include/dht:
-+	$(MKDIR_P) $(builddir)/include
-+	(cd $(builddir)/include && $(LN_S) $(abs_srcdir) dht)

+ 1 - 1
package/dht/dht.hash

@@ -1,3 +1,3 @@
 # Locally computed
 # Locally computed
-sha256  caba469a784a5c359c084099fdc025cfe09b1faec2ba9ba257b7384351c43c0a  dht-0.27.tar.gz
+sha256  c61493be7f036b59df0c921829f15e5c57b1e29d99bca737923e83d028fd736c  dht-0.27-2-g38c9f261d9b58b76b9eaf85f84ec1b35151a1eac.tar.gz
 sha256  06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6  LICENCE
 sha256  06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6  LICENCE

+ 2 - 2
package/dht/dht.mk

@@ -4,8 +4,8 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-DHT_VERSION = 0.27
-DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION))
+DHT_VERSION = 0.27-2-g38c9f261d9b58b76b9eaf85f84ec1b35151a1eac
+DHT_SITE = $(call github,transmission,dht,dht-$(DHT_VERSION))
 DHT_LICENSE = MIT
 DHT_LICENSE = MIT
 DHT_LICENSE_FILES = LICENCE
 DHT_LICENSE_FILES = LICENCE
 DHT_INSTALL_STAGING = YES
 DHT_INSTALL_STAGING = YES