comparison src/qt.mk @ 759:bf4bcb3370fa

changed coding style: make "-i" always the first argument of $(SED) (by Mark Brand)
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 16 Feb 2010 04:12:53 +0100
parents 626db4cc707e
children 1d651946e889
comparison
equal deleted inserted replaced
758:1f5b2dfe8966 759:bf4bcb3370fa
23 23
24 # Native, unpatched build of Qt for moc, rcc, uic and qmake 24 # Native, unpatched build of Qt for moc, rcc, uic and qmake
25 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt) 25 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt)
26 mv '$(1)/$(qt_SUBDIR)' '$(1).native' 26 mv '$(1)/$(qt_SUBDIR)' '$(1).native'
27 27
28 $(SED) 's,PLATFORM_X11=yes,PLATFORM_X11=no,' -i '$(1)'.native/configure 28 $(SED) -i 's,PLATFORM_X11=yes,PLATFORM_X11=no,' '$(1)'.native/configure
29 $(SED) 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' -i '$(1)'.native/configure 29 $(SED) -i 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' '$(1)'.native/configure
30 cd '$(1)'.native && ./configure \ 30 cd '$(1)'.native && ./configure \
31 -opensource \ 31 -opensource \
32 -confirm-license \ 32 -confirm-license \
33 -prefix '$(PREFIX)/$(TARGET)' \ 33 -prefix '$(PREFIX)/$(TARGET)' \
34 -prefix-install \ 34 -prefix-install \
46 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-moc 46 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-moc
47 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-rcc 47 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-rcc
48 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic 48 $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic
49 49
50 # rebuild qmake to use "-unix" as default and to use the correct "ar" command 50 # rebuild qmake to use "-unix" as default and to use the correct "ar" command
51 $(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp 51 $(SED) -i 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' '$(1)'.native/qmake/option.cpp
52 $(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp 52 $(SED) -i 's,"ar -M,"$(TARGET)-ar -M,' '$(1)'.native/qmake/generators/win32/mingw_make.cpp
53 $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)' 53 $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)'
54 54
55 # install the native tools manually 55 # install the native tools manually
56 $(INSTALL) -m755 '$(1)'.native/bin/moc '$(PREFIX)/bin/$(TARGET)-moc' 56 $(INSTALL) -m755 '$(1)'.native/bin/moc '$(PREFIX)/bin/$(TARGET)-moc'
57 $(INSTALL) -m755 '$(1)'.native/bin/rcc '$(PREFIX)/bin/$(TARGET)-rcc' 57 $(INSTALL) -m755 '$(1)'.native/bin/rcc '$(PREFIX)/bin/$(TARGET)-rcc'
71 mv '$(1)'/mkspecs/features/unix '$(1)'/mkspecs/features/unix.orig 71 mv '$(1)'/mkspecs/features/unix '$(1)'/mkspecs/features/unix.orig
72 ln -s win32 '$(1)'/mkspecs/features/unix 72 ln -s win32 '$(1)'/mkspecs/features/unix
73 73
74 # Adjust the mkspec values that contain the TARGET platform prefix. 74 # Adjust the mkspec values that contain the TARGET platform prefix.
75 # The patch planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE. 75 # The patch planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE.
76 $(SED) 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf 76 $(SED) -i 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' '$(1)'/mkspecs/win32-g++/qmake.conf
77 $(SED) 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf 77 $(SED) -i 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' '$(1)'/mkspecs/win32-g++/qmake.conf
78 78
79 # Make sure qmake doesn't use compilation paths meant for unix 79 # Make sure qmake doesn't use compilation paths meant for unix
80 find '$(1)'/src -name '*.pr[oi]' -exec \ 80 find '$(1)'/src -name '*.pr[oi]' -exec \
81 $(SED) 's,\(^\|[^_/]\)unix,\1linux,g' -i {} \; 81 $(SED) -i 's,\(^\|[^_/]\)unix,\1linux,g' {} \;
82 82
83 # Make qmake use compilation paths meant for MinGW or Windows in general 83 # Make qmake use compilation paths meant for MinGW or Windows in general
84 find '$(1)'/src -name '*.pr[oi]' -exec \ 84 find '$(1)'/src -name '*.pr[oi]' -exec \
85 $(SED) 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' -i {} \; 85 $(SED) -i 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' {} \;
86 find '$(1)'/src -name '*.pr[oi]' -exec \ 86 find '$(1)'/src -name '*.pr[oi]' -exec \
87 $(SED) 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' -i {} \; 87 $(SED) -i 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' {} \;
88 88
89 # Configure Qt for MinGW target 89 # Configure Qt for MinGW target
90 # We prefer static mingw-cross-env system libs for static build: 90 # We prefer static mingw-cross-env system libs for static build:
91 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite 91 # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
92 # There is no -system-gif option. NB -system-libmng will not link in shared build. 92 # There is no -system-gif option. NB -system-libmng will not link in shared build.