Patchwork [v2,6/6] qt5: remove configure options from module packages

login
register
mail settings
Submitter Fatih Aşıcı
Date Sept. 20, 2013, 5:43 a.m.
Message ID <1379655795-22429-7-git-send-email-fatih.asici@gmail.com>
Download mbox | patch
Permalink /patch/276236/
State Accepted
Commit f8a7c46ea3beca928705f01b31b75017ba8484ac
Headers show

Comments

Fatih Aşıcı - Sept. 20, 2013, 5:43 a.m.
These packages do not have configure scripts.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
---
 package/qt5/qt5declarative/qt5declarative.mk           |    1 -
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk |    1 -
 package/qt5/qt5imageformats/qt5imageformats.mk         |    1 -
 package/qt5/qt5jsbackend/qt5jsbackend.mk               |    1 -
 package/qt5/qt5multimedia/qt5multimedia.mk             |    1 -
 package/qt5/qt5quick1/qt5quick1.mk                     |    1 -
 package/qt5/qt5script/qt5script.mk                     |    1 -
 package/qt5/qt5svg/qt5svg.mk                           |    1 -
 package/qt5/qt5webkit/qt5webkit.mk                     |    1 -
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           |    1 -
 10 files changed, 10 deletions(-)
Thomas Petazzoni - Sept. 20, 2013, 2:52 p.m.
Dear Fatih Aşıcı,

On Fri, 20 Sep 2013 08:43:15 +0300, Fatih Aşıcı wrote:
> These packages do not have configure scripts.
> 
> Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Peter Korsgaard - Oct. 9, 2013, 9:15 p.m.
>>>>> "Fatih" == Fatih Aşıcı <fatih.asici@gmail.com> writes:

 Fatih> These packages do not have configure scripts.
 Fatih> Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

Committed, thanks.

Patch

diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 943f33d..11b9287 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -11,7 +11,6 @@  QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_CONFIGURE_OPTS += -opensource -confirm-license
 QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0
 QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index fc9a2ec..1e492c9 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -11,7 +11,6 @@  QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5GRAPHICALEFFECTS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 10d744b..52192c6 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -11,7 +11,6 @@  QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0
 QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
index d065f0b..9eccd23 100644
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -11,7 +11,6 @@  QT5JSBACKEND_DEPENDENCIES = qt5base
 QT5JSBACKEND_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5JSBACKEND_CONFIGURE_OPTS += -opensource -confirm-license
 QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0
 QT5JSBACKEND_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 8f62274..1a3ca6b 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -11,7 +11,6 @@  QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_CONFIGURE_OPTS += -opensource -confirm-license
 QT5MULTIMEDIA_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index d1b0b36..f9bb3e8 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -12,7 +12,6 @@  QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsba
 QT5QUICK1_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
 QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0
 QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index e436474..e62e0ac 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,6 @@  QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_CONFIGURE_OPTS += -opensource -confirm-license
 QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0
 QT5SCRIPT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 8a31ac8..2ff7fc8 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -11,7 +11,6 @@  QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SVG_CONFIGURE_OPTS += -opensource -confirm-license
 QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for qt5svg.
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 320a2ea..87b15a9 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -11,7 +11,6 @@  QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf
 QT5WEBKIT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_CONFIGURE_OPTS += -opensource -confirm-license
 QT5WEBKIT_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 322fd70..6f4fdc8 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -11,7 +11,6 @@  QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5XMLPATTERNS_LICENSE = LGPLv2.1 or GPLv3.0
 QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else