depends: switch libnatpmp to CMake

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
bitcoin · Apr 5, 2024 · 3c1ae3e · 3c1ae3e
1 parent 72ba7b5
commit 3c1ae3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/depends/packages/libnatpmp.mk b/depends/packages/libnatpmp.mk
@@ -3,24 +3,18 @@ $(package)_version=f2433bec24ca3d3f22a8a7840728a3ac177f94ba
 $(package)_download_path=https://github.com/miniupnp/libnatpmp/archive
 $(package)_file_name=$($(package)_version).tar.gz
 $(package)_sha256_hash=ef84979950dfb3556705b63c9cd6c95501b75e887fba466234b187f3c9029669
-$(package)_patches=no_libtool.patch
+$(package)_build_subdir=build
 
-define $(package)_set_vars
-  $(package)_build_opts=CC="$($(package)_cc)"
-  $(package)_build_opts_mingw32=CPPFLAGS=-DNATPMP_STATICLIB
-  $(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
-endef
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/no_libtool.patch
+define $(package)_config_cmds
+  $($(package)_cmake) -S .. -B .
 endef
 
 define $(package)_build_cmds
-  $(MAKE) libnatpmp.a $($(package)_build_opts)
+  $(MAKE) natpmp
 endef
 
 define $(package)_stage_cmds
-  mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib &&\
-  install *.h $($(package)_staging_prefix_dir)/include &&\
+  mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib && \
+  install ../natpmp.h  ../natpmp_declspec.h $($(package)_staging_prefix_dir)/include && \
   install libnatpmp.a $($(package)_staging_prefix_dir)/lib
 endef
diff --git a/depends/patches/libnatpmp/no_libtool.patch b/depends/patches/libnatpmp/no_libtool.patch