File tree Expand file tree Collapse file tree 2 files changed +28
-1
lines changed Expand file tree Collapse file tree 2 files changed +28
-1
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ $(package)_version=2.0.20180203
3
3
$(package)_download_path =https://miniupnp.tuxfamily.org/files/
4
4
$(package)_file_name =$(package ) -$($(package ) _version) .tar.gz
5
5
$(package)_sha256_hash =90dda8c7563ca6cd4a83e23b3c66dbbea89603a1675bfdb852897c2c9cc220b7
6
+ $(package)_patches =dont_use_wingen.patch
6
7
7
8
define $(package)_set_vars
8
9
$(package ) _build_opts=CC="$($(package ) _cc) "
14
15
define $(package)_preprocess_cmds
15
16
mkdir dll && \
16
17
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
18
19
endef
19
20
20
21
define $(package)_build_cmds
Original file line number Diff line number Diff line change
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
You can’t perform that action at this time.
0 commit comments