Skip to content

Commit 3de365e

Browse files
committed
build: replace wingenminiupnpcstrings sed with a patch in miniupnpc package
We should be able to drop this once we are using 2.1 or later. See upstream commit: 9663c55c61408fdcc39a82987d2243f816b22932.
1 parent bbc01a7 commit 3de365e

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

depends/packages/miniupnpc.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $(package)_version=2.0.20180203
33
$(package)_download_path=https://miniupnp.tuxfamily.org/files/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=90dda8c7563ca6cd4a83e23b3c66dbbea89603a1675bfdb852897c2c9cc220b7
6+
$(package)_patches=dont_use_wingen.patch
67

78
define $(package)_set_vars
89
$(package)_build_opts=CC="$($(package)_cc)"
@@ -14,7 +15,7 @@ endef
1415
define $(package)_preprocess_cmds
1516
mkdir dll && \
1617
sed -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"$($(package)_version)\"|' -e 's|OS/version|$(host)|' miniupnpcstrings.h.in > miniupnpcstrings.h && \
17-
sed -i.old "s|miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings|miniupnpcstrings.h: miniupnpcstrings.h.in|" Makefile.mingw
18+
patch -p1 < $($(package)_patch_dir)/dont_use_wingen.patch
1819
endef
1920

2021
define $(package)_build_cmds
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
commit e8077044df239bcf0d9e9980b0e1afb9f1f5c446
2+
Author: fanquake <[email protected]>
3+
Date: Tue Aug 18 20:50:19 2020 +0800
4+
5+
Don't use wingenminiupnpcstrings when generating miniupnpcstrings.h
6+
7+
The wingenminiupnpcstrings tool is used on Windows to generate version
8+
information. This information is irrelevant for us, and trying to use
9+
wingenminiupnpcstrings would cause builds to fail, so just don't use it.
10+
11+
We should be able to drop this once we are using 2.1 or later. See
12+
upstream commit: 9663c55c61408fdcc39a82987d2243f816b22932.
13+
14+
diff --git a/Makefile.mingw b/Makefile.mingw
15+
index 574720e..fcc17bb 100644
16+
--- a/Makefile.mingw
17+
+++ b/Makefile.mingw
18+
@@ -74,7 +74,7 @@ wingenminiupnpcstrings: wingenminiupnpcstrings.o
19+
20+
wingenminiupnpcstrings.o: wingenminiupnpcstrings.c
21+
22+
-miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
23+
+miniupnpcstrings.h: miniupnpcstrings.h.in
24+
wingenminiupnpcstrings $< $@
25+
26+
minixml.o: minixml.c minixml.h

0 commit comments

Comments
 (0)