diff --git a/src/qt5.mk b/src/qt5.mk index c699764f..4d001f30 100644 --- a/src/qt5.mk +++ b/src/qt5.mk @@ -16,9 +16,3 @@ $(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 18957bf0..35e610a2 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -18,8 +18,6 @@ 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 5dec03f5..4d57d813 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -62,8 +62,6 @@ 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 3cca1bea..d0702297 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -18,8 +18,6 @@ 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 dc0fde9a..84bd7fdf 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -18,8 +18,6 @@ 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 f10b5978..8952e588 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -18,8 +18,6 @@ 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 6bb4bad6..1c802f03 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -18,8 +18,6 @@ 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 df437f63..949cf0f0 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -18,8 +18,6 @@ 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 8dc3c8d3..22ae68cb 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -18,8 +18,6 @@ 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 9313a465..b8e67a3a 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -18,8 +18,6 @@ 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 e44c1983..6df9fe62 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -18,8 +18,6 @@ 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 8cb8af6e..c61c122b 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -18,8 +18,6 @@ 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 14d9e37e..b236c33e 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -18,8 +18,6 @@ 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 692db013..6c4c6ac4 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -18,8 +18,6 @@ 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 4784d6c2..61d2d02f 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -18,8 +18,6 @@ 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 1da91b03..9413fedb 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -18,8 +18,6 @@ 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 6ded9456..75f9fd97 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -18,8 +18,6 @@ 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 30b79644..163ac16c 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -19,8 +19,6 @@ 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 f0bf94ae..97e848e9 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -18,8 +18,6 @@ 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 bb95391c..ac037224 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -18,8 +18,6 @@ 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 90017024..2c92bed1 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -20,8 +20,6 @@ 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 fd17fdae..a2723ddb 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -18,8 +18,6 @@ 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 0907d93f..0137cb48 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -18,8 +18,6 @@ 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 7b370f88..37e70860 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -18,8 +18,6 @@ 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 =