Revert "qt5: try to fix CMake files"

This reverts commit 8a6cf7cab7.
2014-09-23 09:43:28 -07:00 · 2014-09-23 09:43:28 -07:00 · a108a13fcf
parent 2b66b7c22a
commit a108a13fcf
24 changed files with 0 additions and 52 deletions
--- 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
--- 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 =
--- 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)'
--- 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 :=
--- 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 :=
--- 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 =
--- 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 :=
--- 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 :=
--- 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 :=
--- 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 =
--- 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 :=
--- 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 :=
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 :=
--- 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 :=
--- 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 :=
--- 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 =
--- 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 =
--- 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 =
--- 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 =