[Buildroot] [PATCH v4 4/6] quazip: Patch .pro file to correctly crosscompile and use qmake infra

Andreas Naumann anaumann at ultratronik.de
Fri Mar 22 18:39:02 UTC 2019


The quazip .pro files uses the target only prefix for cross staging install.
This breaks using the new qmake infra, so add a minor patch to fix this.

Signed-off-by: Andreas Naumann <anaumann at ultratronik.de>
---
 .../0001-Fix-crosscompile-staging-install.patch  | 16 ++++++++++++++++
 package/quazip/quazip.mk                         | 10 ----------
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 package/quazip/0001-Fix-crosscompile-staging-install.patch

diff --git a/package/quazip/0001-Fix-crosscompile-staging-install.patch b/package/quazip/0001-Fix-crosscompile-staging-install.patch
new file mode 100644
index 0000000000..96cae37283
--- /dev/null
+++ b/package/quazip/0001-Fix-crosscompile-staging-install.patch
@@ -0,0 +1,16 @@
+Index: quazip-0.7.6/quazip/quazip.pro
+===================================================================
+--- quazip-0.7.6.orig/quazip/quazip.pro
++++ quazip-0.7.6/quazip/quazip.pro
+@@ -47,9 +47,9 @@ CONFIG(debug, debug|release) {
+ }
+ 
+ unix:!symbian {
+-    headers.path=$$PREFIX/include/quazip
++    headers.path=$$[QT_INSTALL_PREFIX]/include/quazip
+     headers.files=$$HEADERS
+-    target.path=$$PREFIX/lib/$${LIB_ARCH}
++    target.path=$$[QT_INSTALL_PREFIX]/lib/$${LIB_ARCH}
+     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+     INSTALLS += headers target
+ 
diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk
index eef423b58a..1b34c9fc2a 100644
--- a/package/quazip/quazip.mk
+++ b/package/quazip/quazip.mk
@@ -13,14 +13,4 @@ QUAZIP_DEPENDENCIES = \
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 
-QUAZIP_CONF_OPTS = PREFIX=/usr
-
-define QUAZIP_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
-endef
-
-define QUAZIP_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
-endef
-
 $(eval $(qmake-package))
-- 
2.21.0




More information about the buildroot mailing list