summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qt5.mk6
-rw-r--r--src/qtactiveqt.mk2
-rw-r--r--src/qtbase.mk2
-rw-r--r--src/qtconnectivity.mk2
-rw-r--r--src/qtdeclarative.mk2
-rw-r--r--src/qtenginio.mk2
-rw-r--r--src/qtgraphicaleffects.mk2
-rw-r--r--src/qtimageformats.mk2
-rw-r--r--src/qtlocation.mk2
-rw-r--r--src/qtmultimedia.mk2
-rw-r--r--src/qtquick1.mk2
-rw-r--r--src/qtquickcontrols.mk2
-rw-r--r--src/qtscript.mk2
-rw-r--r--src/qtsensors.mk2
-rw-r--r--src/qtserialport.mk2
-rw-r--r--src/qtservice.mk2
-rw-r--r--src/qtsvg.mk2
-rw-r--r--src/qtsystems.mk2
-rw-r--r--src/qttools.mk2
-rw-r--r--src/qttranslations.mk2
-rw-r--r--src/qtwebkit.mk2
-rw-r--r--src/qtwebsockets.mk2
-rw-r--r--src/qtwinextras.mk2
-rw-r--r--src/qtxmlpatterns.mk2
24 files changed, 52 insertions, 0 deletions
diff --git a/src/qt5.mk b/src/qt5.mk
index 4d001f3..c699764 100644
--- a/src/qt5.mk
+++ b/src/qt5.mk
@@ -16,3 +16,9 @@ $(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\
define $(PKG)_UPDATE
echo $(qtbase_VERSION)
endef
+
+define $(PKG)_FIX_CMAKE_FILE
+ $(if $(BUILD_STATIC), \
+ find $(PREFIX)/$(TARGET)/qt5/lib/cmake/ -name '*\.cmake' | \
+ xargs $(SED) -i 's!/\(.*\)\.lib!/lib\1\.a!g')
+endef
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 35e610a..18957bf 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 4d57d81..5dec03f 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -62,6 +62,8 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
+ $(qt5_FIX_CMAKE_FILE)
+
mkdir '$(1)/test-qt'
cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
$(MAKE) -C '$(1)/test-qt' -j '$(JOBS)'
diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk
index d070229..3cca1be 100644
--- a/src/qtconnectivity.mk
+++ b/src/qtconnectivity.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 84bd7fd..dc0fde9 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtenginio.mk b/src/qtenginio.mk
index 8952e58..f10b597 100644
--- a/src/qtenginio.mk
+++ b/src/qtenginio.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 1c802f0..6bb4bad 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 949cf0f..df437f6 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtlocation.mk b/src/qtlocation.mk
index 22ae68c..8dc3c8d 100644
--- a/src/qtlocation.mk
+++ b/src/qtlocation.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index b8e67a3..9313a46 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 6df9fe6..e44c198 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk
index c61c122..8cb8af6 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtscript.mk b/src/qtscript.mk
index b236c33..14d9e37 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsensors.mk b/src/qtsensors.mk
index 6c4c6ac..692db01 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtserialport.mk b/src/qtserialport.mk
index 61d2d02..4784d6c 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtservice.mk b/src/qtservice.mk
index 9413fed..1da91b0 100644
--- a/src/qtservice.mk
+++ b/src/qtservice.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)/qtservice/buildlib' -j '$(JOBS)'
$(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index 75f9fd9..6ded945 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsystems.mk b/src/qtsystems.mk
index 163ac16..30b7964 100644
--- a/src/qtsystems.mk
+++ b/src/qtsystems.mk
@@ -19,6 +19,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttools.mk b/src/qttools.mk
index 97e848e..f0bf94a 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index ac03722..bb95391 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk
index 2c92bed..9001702 100644
--- a/src/qtwebkit.mk
+++ b/src/qtwebkit.mk
@@ -20,6 +20,8 @@ define $(PKG)_BUILD_SHARED
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index a2723dd..fd17fda 100644
--- a/src/qtwebsockets.mk
+++ b/src/qtwebsockets.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk
index 0137cb4..0907d93 100644
--- a/src/qtwinextras.mk
+++ b/src/qtwinextras.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 37e7086..7b370f8 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
+
+ $(qt5_FIX_CMAKE_FILE)
endef
$(PKG)_BUILD_i686-pc-mingw32 =
generated by cgit v0.12 at 2024-09-27 21:28:23 (GMT)