From 80dcaeb8946122e471bf65adece6801c026e9b83 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Mon, 5 Oct 2009 10:43:48 +0200 Subject: build the native Qt tools from unpatched sources --- src/qt.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qt.mk b/src/qt.mk index c3f1025..0eea299 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -40,14 +40,9 @@ endef define $(PKG)_BUILD - # Note on patchfile qt-win32.patch - # A patchfile should have been applied already. Since we make a copy - # of the patched directory here, it is important that the changes - # in the patches do not break the native build. - - # First configure a minimal native version of Qt - # for moc, rcc, uic and qmake - cp -a '$(1)' '$(1)'.native + # Native, unpatched build of Qt for moc, rcc, uic and qmake + cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt) + mv '$(1)/$(qt_SUBDIR)' '$(1).native' cd '$(1)'.native && ./configure \ -opensource \ -confirm-license \ -- cgit v0.12