Skip to contentSkip to conversation

utils/genrandconfig: drop qt4 fixups

PATCH New Peter Korsgaard 2 participants 4 messages Feb 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 utils/genrandconfig: drop qt4 fixups

Now that Qt4 is removed, these fixups can be removed as well.

---
 utils/genrandconfig | 8 --------
 1 file changed, 8 deletions(-)
utils/genrandconfig +0 -8
index 047740a411..a2190d6d25 100755
@@ -311,16 +311,8 @@ def fixup_config(configfile):
         return False
     # The cs nios2 2017.02 toolchain is affected by binutils PR19405
     if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \
-       'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines:
-        return False
-    # The cs nios2 2017.02 toolchain is affected by binutils PR19405
-    if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \
        'BR2_PACKAGE_FLANN=y\n' in configlines:
         return False
-    # or1k affected by binutils PR21464
-    if 'BR2_or1k=y\n' in configlines and \
-       'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines:
-        return False
 
     with open(configfile, "w+") as configf:
         configf.writelines(configlines)
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/3 package/gpsd: remove qt support

Now that Qt4 is removed, the support in gpsd can be removed as well.

---
 package/gpsd/gpsd.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
package/gpsd/gpsd.mk +2 -9
index ade2d2a163..48d21348b9 100644
@@ -23,7 +23,8 @@ GPSD_SCONS_OPTS = \
 	prefix=/usr\
 	sysroot=$(STAGING_DIR)\
 	strip=no\
-	python=no
+	python=no \
+	qt=no
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 GPSD_DEPENDENCIES += ncurses
@@ -48,14 +49,6 @@ ifeq ($(BR2_microblaze),y)
 GPSD_CFLAGS += -O0
 endif
 
-# Enable or disable Qt binding
-ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
-GPSD_DEPENDENCIES += qt
-else
-GPSD_SCONS_OPTS += qt=no
-endif
-
 # If libusb is available build it before so the package can use it
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 GPSD_DEPENDENCIES += libusb
Signature · 1 line
2.11.0
#2 lore raw

PATCH 3/3 package/libv4l: remove qt support

In reply to Peter Korsgaard

Now that Qt4 is removed, the support in libv4l can be removed as well.

---
 package/libv4l/libv4l.mk | 3 ---
 1 file changed, 3 deletions(-)
package/libv4l/libv4l.mk +0 -3
index 6df69c19f0..71011d9102 100644
@@ -73,9 +73,6 @@ LIBV4L_CONF_ENV += \
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endif
-else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
-LIBV4L_CONF_OPTS += --enable-qv4l2
-LIBV4L_DEPENDENCIES += qt
 else
 LIBV4L_CONF_OPTS += --disable-qv4l2
 endif
Signature · 1 line
2.11.0
#3 lore raw

PATCH 1/3 utils/genrandconfig: drop qt4 fixups

In reply to Peter Korsgaard
Quoted 3 lines · Peter Korsgaard

Now that Qt4 is removed, these fixups can be removed as well.

Series applied to master, thanks.

Regards,
Arnout

Quoted 26 lines
---
 utils/genrandconfig | 8 --------
 1 file changed, 8 deletions(-)
utils/genrandconfig +0 -8
index 047740a411..a2190d6d25 100755
@@ -311,16 +311,8 @@ def fixup_config(configfile):
         return False
     # The cs nios2 2017.02 toolchain is affected by binutils PR19405
     if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \
-       'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines:
-        return False
-    # The cs nios2 2017.02 toolchain is affected by binutils PR19405
-    if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \
        'BR2_PACKAGE_FLANN=y\n' in configlines:
         return False
-    # or1k affected by binutils PR21464
-    if 'BR2_or1k=y\n' in configlines and \
-       'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines:
-        return False
 
     with open(configfile, "w+") as configf:
         configf.writelines(configlines)