]>
Commit | Line | Data |
---|---|---|
b9d1ce76 UH |
1 | These patches are currently required to get a properly working |
2 | MXE setup for sigrok usage. | |
3 | ||
4 | - Force libzip to use its own mkstemp() implementation. | |
5 | http://sigrok.org/bugzilla/show_bug.cgi?id=570#c2 | |
6 | ||
b9d1ce76 UH |
7 | - Disable currently broken qtassistant (we don't need it anyway). |
8 | https://github.com/mxe/mxe/issues/565 | |
4acee7ed | 9 | |
b9d1ce76 | 10 | diff --git a/src/libzip.mk b/src/libzip.mk |
4acee7ed | 11 | index 9d1e189..d4d5bf9 100644 |
b9d1ce76 UH |
12 | --- a/src/libzip.mk |
13 | +++ b/src/libzip.mk | |
14 | @@ -18,7 +18,8 @@ endef | |
15 | ||
16 | define $(PKG)_BUILD | |
17 | cd '$(1)' && ./configure \ | |
18 | - $(MXE_CONFIGURE_OPTS) | |
19 | + $(MXE_CONFIGURE_OPTS) \ | |
4acee7ed | 20 | + ac_cv_func_mkstemp=no |
b9d1ce76 UH |
21 | $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) SUBDIRS=lib |
22 | ||
23 | '$(TARGET)-gcc' \ | |
24 | diff --git a/src/qt.mk b/src/qt.mk | |
4acee7ed | 25 | index 5bf3b08..bd8ef7a 100644 |
b9d1ce76 UH |
26 | --- a/src/qt.mk |
27 | +++ b/src/qt.mk | |
4acee7ed UH |
28 | @@ -75,12 +75,12 @@ define $(PKG)_BUILD |
29 | # lrelease (from linguist) needed to prepare translation files | |
b9d1ce76 | 30 | $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install |
b9d1ce76 UH |
31 | |
32 | - cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro | |
33 | - # can't figure out where -lQtCLucene comes from so use | |
34 | - # sed on the output instead of patching the input | |
35 | - $(MAKE) -C '$(1)/tools/assistant' sub-lib-qmake_all | |
36 | - $(SED) -i 's,-lQtCLucene$$,-lQtCLucene4,' '$(1)/tools/assistant/lib/Makefile.Release' | |
37 | - $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install | |
38 | + ## cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro | |
39 | + ## # can't figure out where -lQtCLucene comes from so use | |
40 | + ## # sed on the output instead of patching the input | |
41 | + ## $(MAKE) -C '$(1)/tools/assistant' sub-lib-qmake_all | |
42 | + ## $(SED) -i 's,-lQtCLucene$$,-lQtCLucene4,' '$(1)/tools/assistant/lib/Makefile.Release' | |
43 | + ## $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install | |
44 | ||
45 | # likewise for these two | |
46 | cd '$(1)/tools/designer/src/designer' && '$(1)/bin/qmake' designer.pro |