Mercurial > mxe-octave

changeset 464:0174ea97b91d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; make" will work
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 04 Oct 2009 03:29:37 +0200
parents 699fdda7068e
children ecd04bd51de2
files src/qt-win32.patch src/qt.mk
diffstat 2 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt-win32.patch	Sun Oct 04 02:40:06 2009 +0200
+++ b/src/qt-win32.patch	Sun Oct 04 03:29:37 2009 +0200
@@ -1,4 +1,5 @@
 Copyright (C) 2009  Mark Brand
+                    Volker Grabsch
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -170,10 +171,10 @@
 -QMAKE_IDL		= midl
 -QMAKE_LIB		= ar -ru
 -QMAKE_RC		= windres
-+QMAKE_MOC		= moc
-+QMAKE_UIC		= uic
-+QMAKE_IDC		= idc
-+QMAKE_RCC		= rcc
++#QMAKE_IDC		= HOSTPLATFORMPREFIX-idc
++QMAKE_MOC		= HOSTPLATFORMPREFIX-moc
++QMAKE_RCC		= HOSTPLATFORMPREFIX-rcc
++QMAKE_UIC		= HOSTPLATFORMPREFIX-uic
 +
 +#QMAKE_IDL		= midl
 +QMAKE_LIB		= HOSTPLATFORMPREFIX-ar -ru
--- a/src/qt.mk	Sun Oct 04 02:40:06 2009 +0200
+++ b/src/qt.mk	Sun Oct 04 03:29:37 2009 +0200
@@ -45,10 +45,6 @@
     # of the patched directory here, it is important that the changes
     # in the patches do not break the native build.
 
-    # Bogus install bin directory for the DLLs
-    # Should stay empty because of -prefix-install
-    mkdir '$(1)'/bindirsink
-
     # First configure a minimal native version of Qt
     # for moc, rcc, uic and qmake
     cp -a '$(1)' '$(1)'.native
@@ -57,7 +53,6 @@
         -confirm-license \
         -prefix '$(PREFIX)/$(TARGET)' \
         -prefix-install \
-        -bindir '$(1)'/bindirsink \
         -fast \
         -nomake demos \
         -nomake examples \
@@ -70,7 +65,12 @@
     $(MAKE) -C '$(1)'.native -j $(JOBS) sub-moc
     $(MAKE) -C '$(1)'.native -j $(JOBS) sub-rcc
     $(MAKE) -C '$(1)'.native -j $(JOBS) sub-uic
-    $(MAKE) -C '$(1)'.native clean
+
+    # install the native tools manually
+    $(INSTALL) -m755 '$(1)'.native/bin/moc   '$(PREFIX)/bin/$(TARGET)-moc'
+    $(INSTALL) -m755 '$(1)'.native/bin/rcc   '$(PREFIX)/bin/$(TARGET)-rcc'
+    $(INSTALL) -m755 '$(1)'.native/bin/uic   '$(PREFIX)/bin/$(TARGET)-uic'
+    $(INSTALL) -m755 '$(1)'.native/bin/qmake '$(PREFIX)/bin/$(TARGET)-qmake'
 
     # Trick the build system into using native tools
     ln -s '$(1)'.native/bin/{moc,rcc,uic,qmake} '$(1)'/bin/
@@ -144,9 +144,6 @@
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(TARGET)-ranlib '$(1)'/lib/*.a
+    rm -rf '$(PREFIX)/$(TARGET)/mkspecs'
     $(MAKE) -C '$(1)' install
-
-    # install native tools manually
-    $(INSTALL) -m755 '$(1)'.native/bin/{moc,rcc,uic} '$(PREFIX)/$(TARGET)/bin/'
-    $(INSTALL) -m755 '$(1)'.native/bin/qmake '$(PREFIX)/bin/$(TARGET)-qmake'
 endef