qt: Silence build and force xmlpatterns
library on for Qt4 (#19591)
For some mysterious reason Qt4 stopped building the xmlpatterns component, needed by some downstream packages. With this patch, the component successfully builds with ``` qt@4.8.7~dbus~debug~examples~framework~gtk~opengl~phonon+shared~sql~ssl~tools~webkit freetype=none arch=linux-rhel7-haswell %gcc@10.2.0 ```
This commit is contained in:
parent
f7269ffd0a
commit
ef9c80de23
@ -333,10 +333,13 @@ def conf(name):
|
|||||||
conf('g++-unix'))
|
conf('g++-unix'))
|
||||||
|
|
||||||
if self.spec.satisfies('@4'):
|
if self.spec.satisfies('@4'):
|
||||||
# Necessary to build with GCC 6 and other modern compilers
|
# The gnu98 flag is necessary to build with GCC 6 and other modern
|
||||||
# http://stackoverflow.com/questions/10354371/
|
# compilers (see http://stackoverflow.com/questions/10354371/);
|
||||||
|
# be permissive because of the abundance of older code, and hide
|
||||||
|
# all warnings because there are so many of them with newer
|
||||||
|
# compilers
|
||||||
with open(conf('gcc-base'), 'a') as f:
|
with open(conf('gcc-base'), 'a') as f:
|
||||||
f.write("QMAKE_CXXFLAGS += -std=gnu++98\n")
|
f.write("QMAKE_CXXFLAGS += -std=gnu++98 -fpermissive -w\n")
|
||||||
|
|
||||||
@when('@4: %intel')
|
@when('@4: %intel')
|
||||||
def patch(self):
|
def patch(self):
|
||||||
@ -523,6 +526,7 @@ def configure(self, spec, prefix):
|
|||||||
'-{0}webkit'.format('' if '+webkit' in spec else 'no-'),
|
'-{0}webkit'.format('' if '+webkit' in spec else 'no-'),
|
||||||
'-{0}phonon'.format('' if '+phonon' in spec else 'no-'),
|
'-{0}phonon'.format('' if '+phonon' in spec else 'no-'),
|
||||||
'-arch', str(spec.target.family),
|
'-arch', str(spec.target.family),
|
||||||
|
'-xmlpatterns',
|
||||||
])
|
])
|
||||||
|
|
||||||
# Disable phonon backend until gstreamer is setup as dependency
|
# Disable phonon backend until gstreamer is setup as dependency
|
||||||
|
Loading…
Reference in New Issue
Block a user