mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 08:11:50 -04:00
4f0a5e1540
SIP: As mentioned in the update from sip to sip5, this is a transitional version to remove what is deprecated in sip4. Sip6 completely removes the deprecated parts. Unfortunately, some ports — mostly cura things — can not use sip6, so we reintroduce sip4. PyQt: At the same time, we took the opportunity to simplify PyQT and propose only one package as for devel/pyside2. */py-qt5-* have been merged — excepted chart, networkauth and webengine — into devel/py-qt5-pyqt. This allows us to be in adequacy with the packages that the author of these libraries proposes, namely: PyQt - devel/py-qt5-pyqt PyQt-Charts - x11-toolkits/py-qt5-chart PyQt-NetworkAuth – net/py-qt5-networkauth PyQt-WebEngine – www/py-qt5-webengine SIP – devel/py-sip py-sip - devel/py-qt5-sip PyQt-builder - devel/py-qtbuilder Qscintilla - devel/py-qt5-qscintilla2 Reviewed by: diizzy, kde Tested by: kai, rhurlin, arrowd, madpilot Approved by: makc, tcberner, kde Differential Revision: https://reviews.freebsd.org/D33237 Exp-run by: antoine
28 lines
968 B
Python
28 lines
968 B
Python
sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
|
|
an invocation with an explicit source file name to "$<".
|
|
|
|
This works with GNU make, but not make(1), where it $< evaluates to nothing
|
|
in this context.
|
|
|
|
Switch back to the previous version to avoid having to depend on devel/gmake
|
|
(figuring out which ports need it is not trivial).
|
|
--- siputils.py
|
|
+++ siputils.py
|
|
@@ -1683,7 +1683,7 @@
|
|
cpp = "moc_" + root + ".cpp"
|
|
|
|
mfile.write("\n%s: %s\n" % (cpp, mf))
|
|
- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
|
|
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
|
|
|
|
mfile.write("\n$(TARGET): $(OFILES)\n")
|
|
|
|
@@ -1980,7 +1980,7 @@
|
|
mf = os.path.join(self._src_dir, mf)
|
|
|
|
mfile.write("\n%s: %s\n" % (cpp, mf))
|
|
- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
|
|
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
|
|
|
|
mfile.write("\n$(TARGET): $(OFILES)\n")
|
|
|