Since the move of many host binaries to $(HOST_DIR), the TARGET_PATH
for internal toolchain had been changed to include $(HOST_DIR)/bin and
$(HOST_DIR)/usr/bin, but this change was not reflected to the
TARGET_PATH used in external toolchain configuration. This patches
fixes this.
We also remove $(STAGING_DIR)/bin and $(STAGING_DIR)/usr/bin from the
TARGET_PATH in external toolchain configuration, since the STAGING_DIR
is not supposed to contain host binaries.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Many packages used to depend on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7,
but this is useless since BR2_PACKAGE_XORG is a non-existing
configuration option. So, these depencies gets simplified to
BR2_PACKAGE_XORG7 only.
Some others were depending on BR2_PACKAGE_TINYX (which doesn't) exist
or BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tiny ||
BR2_PACKAGE_XSERVER_x11r7. Replace all that mess by a simple
dependency on BR2_PACKAGE_XORG7.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The selection of the X.org server type was really strange. The user
had to select between none, tinyx and modular. Now, the menuconfig
interface display a single item for X.org, that can be
selected/unselected. This entry contains a submenu, that allows to
select the type of the X.org server (tinyX or modular) and that allows
(as before) to enable/disable X.org libraries, drivers, etc.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Bump the version of Direct FB to 1.4.1. Fixes bug #467. Thanks to
Lionel Landwerlin <lionel.landwerlin@openwide.fr> for the
notification.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Closes#387.
When tremor is selected, the normal libvorbis shouldn't get built and
tremer should get installed into staging_dir as well.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Ruby 1.9.1 handle cross compilation better, espescially extensions
(I'm working on ARM at91sam9263-ek).
This patch also disable ruby doc generation and ipv6.
[Peter: fixed ipv6 handling]
Signed-off-by: laurent laffont <laurent.laffont@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Enchant is a spell checking library that provides a consistent API across
a number of spell-checking system backends.
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The fixes made to qmake.conf for the cross-compiling tools were not
sufficient in the case of an external toolchain, since the CFLAGS were
not taken into account. And the --sysroot option contained in the
CFLAGS are very important for external toolchains to work.
Additionally, it makes sure that Qtopia is compiled with the proper
CFLAGS, even if an external toolchain isn't used.
Closes#417,
New package spawn-fcgi, basically a FastCGI process spawner.
This was previously included in lighttpd up to version 1.4.22 and is now
a separate project.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Closes#419.
lighttpd 1.4.23 is out, there are many bugfixes from 1.4.20 currently in
buildroot:
* Fix workaround for incorrect path info/scriptname if fastcgi prefix is
”/” (fixes#729)
* Finally removed spawn-fcgi
* Fix bug with FastCGI request id overflow under high load; just use always
id 1 as we don’t use multiplexing. (thx jgray)
* Workaround broken operating systems: check for trailing ’/’ in filenames
(fixes#1989)
Plus fixes from 1.4.22 and 1.4.21.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Several issues were encountered when trying to build Matchbox. This
patches fixes these issues :
* Selecting BR2_PACKAGE_MATCHBOX should select BR2_PACKAGE_XORG7,
otherwise the x11r7 mk files are not included, and matchbox.mk
refers to non-existing dependencies (such as xlib_libXtst).
* In matchbox.mk, wrong dependencies for Matchbox keyboard. When
pango is available, use it through --enable-pango, otherwise, add
the dependency to xlib_libXft
* Enable AUTORECONF for libXfont and libXft, otherwise the libtool
Buildroot patch has no effect, and these packages fail to build
without the libtool hack.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The patch introduced at c579e32dbe was
incorrect, since __USE_GNU is an internal C library defined, and
should not be used by programs. _GNU_SOURCE should be used instead.
This fixes a build failure on Dropbear when compiling against a
glibc-based toolchain.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Closed#333.
* Refactor the internal representation of SQL expressions so that they
use less memory on embedded platforms.
* Reduce the amount of stack space used
* Fix an 64-bit alignment bug on HP/UX and Sparc
* The sqlite3_create_function() family of interfaces now return
SQLITE_MISUSE instead of SQLITE_ERROR when passed invalid parameter
combinations.
* When new tables are created using CREATE TABLE ... AS SELECT ... the
datatype of the columns is the simplified SQLite datatype (TEXT, INT,
REAL, NUMERIC, or BLOB) instead of a copy of the original datatype
from the source table.
* Resolve race conditions when checking for a hot rollback journal.
* The sqlite3_shutdown() interface frees all mutexes under windows.
* Enhanced robustness against corrupt database files
* Continuing improvements to the test suite and fixes to obscure bugs
and inconsistencies that the test suite improvements are uncovering.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Closes#379
update DirectFB to version 1.4.0
A new stable version of DirectFB has been released upstream,
http://directfb.org/index.php?path=Main%2FNews&entry=2009-06-04-1.niels
Attached patch updates the DirectFB package and introduces a BR2
configuration option for the RGB16 dithering feature that is new in
DirectFB 1.4.0.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Closes#349.
Attached patch updates libsoup to version 2.26.2.
This is relevant for bug 303 as it allows to compile gvfs with much
less patching.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Add support for configuring security context support to allow building for
non-SELinux targets.
Remove some obsolete patches.
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Closes#409.
php-5.2.10 is out, mostly misc bugfixes, one small security fix:
Security Enhancements and Fixes in PHP 5.2.10:
* Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg
files). (Pierre)
Key enhancements in PHP 5.2.10 include:
* Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)
* Fixed memory corruptions while reading properties of zip files. (Ilia)
* Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
* Fixed segfault on invalid session.save_path. (Hannes)
* Fixed leaks in imap when a mail_criteria is used. (Pierre)
* Changed default value of array_unique()'s optional sorting type parameter
back to SORT_STRING to fix backwards compatibility breakage introduced in PHP
5.2.9. (Moriyoshi)
* Fixed bug #47940 (memory leaks in imap_body). (Pierre, Jake Levitt)
* Fixed bug #47903 ("@" operator does not work with string offsets).
(Felipe)
* Fixed bug #47644 (Valid integers are truncated with json_decode()).
(Scott)
* Fixed bug #47564 (unpacking unsigned long 32bit big endian returns wrong
result). (Ilia)
* Fixed bug #47365 (ip2long() may allow some invalid values on certain
64bit systems).
* Over 100 bug fixes.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Override nfs mount support based on BR2_INET_RPC setting, so BR will DTRT.
This way you will automatically get NFS support in busybox if available in
the toolchain, and the build won't break if the defconfig enables it but
the user has it disabled in the toolchain.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
As device-mapper has moved to lvm2, dmraid must now require lvm2.
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Also add a config option for the app plugin that was moved from
to gst-plugins-base from gst-plugins-bad in version 0.10.22.
Closes#393.
Signed-off-by: Will Newton <will.newton@gmail.com>
gstreamer uses libxml2 to support the plugin registry and pipeline
load/save features. This change allows the user to build gstreamer without
libxml2 which saves a large amount of space on the target.
Closes#373.
Signed-off-by: Will Newton <will.newton@gmail.com>
* Upgrade to version 0.98
* Use --disable-Werror, otherwise it doesn't build since warnings are
treated as errors
* Don't depend on tiff, which isn't mandatory, and doesn't
build. Once tiff is fixed, we can re-add it as a dependency.
dmraid is hard coded with -L$(DESTDIR)$(libdir) which tries to link in
the host systems' libs
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
neon should depend on host-pkgconfig rather than pkgconfig.
Closes#385.
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
0.15.0 seems to never have been in Debian (it is atleast not on
snapshot.debian.net), so use the real upstream (freedesktop) instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The avahi udhcpc script used to start up avahi-autoipd at defconfig
(init) time, and then kill it if a dhcp lease was acquired, leading
to extra network traffic.
Change it to only start avahi-autoipd on timeout and dhcp nak.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Look at BR2_STRIP_none to decide whether to strip diffutils binaries.
This avoids bad quoting in diffutils Makefile.in (generated by automake 1.6)
when STRIP is set to: true -Not_stripping
Signed-off-by: Marc Gauthier <marc@alumni.uwaterloo.ca>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The -D option to install only works portably when the destination is
a file. Specifying the filename avoids the following build error (at
least on some hosts):
"/usr/bin/install: cannot overwrite directory `/tmp/buildroot/
project_build_foobar/uclibc/root/etc/init.d' with non-directory"
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
mesa wants to compile and run gen_matypes at build time, so make sure it
gets compiled for the host and not for the target.
Closes#323.
Signed-off-by: Jim Persson <spambox@nurd.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Olaf Rempel <razzor@kopf-tisch.de>
Acked-by: Thiago A. Correa <thiago.correa@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The pdftops support in cups needs C++ support, whereas the rest doesn't.
Add a BR2_PACKAGE_CUPS_PDFTOPS (depending on C++ support) to enable it
if needed.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
- bump version to 2009.03.8
- internal fuse support, no longer depends on libfuse/pkgconfig
- fix WCHAR dependency
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Some configure scripts seems to ignore CXX settings if it is set to
the empty string, and goes back to the default (<arch>-linux-g++),
so use false instead, as that will loudly break the build if the
C++ compiler is ever used.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The directory argument was introduced to support packages in
subdirectories of package/ several months ago.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The shared-mime-info package contains the core database of common
types and the update-mime-database command used to extend it.
The only thing that is actually needed in the target is the file
mime.cache. In order to generate that file, shared-mime-info is
installed into the staging-dir. The idea is that other packages might
add more mime-info files and these should be collected in
staging-dir. From there the mime.cache file is created using tools
installed in host-dir and copied to target.
From Sven Neumann <s.neumann@raumfeld.com>
Modifications by Thomas Petazzoni :
* Add a patch to the main Makefile.am so that the $(XMLLINT) variable
is used instead of hardcoding xmllint
* Apply the patch in the host build of shared-mime-info
* In the target build, pass an XMLLINT environment variable so that
the xmllint binary isn't searched in $(STAGING_DIR) but in
$(HOST_DIR)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Some other packages, such as shared-mime-info, might need libxml2 and
related tools (xmllint, etc.) to be available on the host. This patch
modifies tthe libxml2 Makefile to compile libxml2 for the host, in
$(HOST_DIR).
Patch from Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
And remove the unnedded c_rehash binary while we're at it.
Patch by Gustavo Zacarias <gustavo@zacarias.com.br>, closes#307.
Saves ~250k on PPC with default config (E.G. -Os)
Patch by Olaf Rempel <razzor@kopf-tisch.de>, closes#245.
lzop is a file compressor which is very similar to gzip.
lzop uses the LZO data compression library for compression services.
http://www.lzop.org/
Subentries of a menu automatically gets hidden if the dependencies of the
menu element aren't available, so get rid of the individual depends on
BR2_PACKAGE_NCFTP.
qmake.conf needs to be tweaked to make QT use the correct toolchain for
building, but the current approach relies on the fact that the selected
platform qmake.conf has QMAKE_{CC,CXX,LINK,LINK_SHLIB,AR,OBJCOPY,RANLIB,STRIP}
lines that are then adapted to the correct settings.
This is true for some configs (namely arm and avr32), but not for others -
Causing the build to fail (or build for the host).
Instead add a QTOPIA4_QMAKE_SET macro which removes any existing lines
and add the correct lines to the qmake.conf, so it works no matter if the
platform provides them or not.
Revert r25827 and instead copy over the host aclocal files of the stuff
needed for auto* (libtool + pkgconfig). These logically belong with the
target stuff, as they are used for the target auto* toolchain.
Long term we should probably consider using
aclocal --acdir=$(STAGING_DIR)/usr/share/aclocal, so the host .m4 files
cannot interfere with the target build.
Change the definition of TARGET_LDFLAGS to use --sysroot
$(STAGING_DIR) instead of -L$(STAGING_DIR)/lib
-L$(STAGING_DIR)/usr/lib. It fixes the following failure while trying
to build mtd-utils :
/usr/local/xtools/arm-unknown-linux-uclibcgnueabi/bin/arm-unknown-linux-uclibcgnueabi-gcc -L/home/thomas/local/buildroot-output/build_arm/staging_dir/lib -L/home/thomas/local/buildroot-output/build_arm/staging_dir/usr/lib -o /home/thomas/local/buildroot-output/build_arm/mtd_orig/flash_eraseall /home/thomas/local/buildroot-output/build_arm/mtd_orig/crc32.o /home/thomas/local/buildroot-output/build_arm/mtd_orig/flash_eraseall.o
/usr/local/xtools/arm-unknown-linux-uclibcgnueabi/lib/gcc/arm-unknown-linux-uclibcgnueabi/4.3.2/../../../../arm-unknown-linux-uclibcgnueabi/bin/ld: cannot find /lib/libc.so.0
collect2: ld returned 1 exit status
make[1]: *** [/home/thomas/local/buildroot-output/build_arm/mtd_orig/flash_eraseall] Error 1
At the same time, simplify the definition of TARGET_CFLAGS, because
the -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include
-I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include are
no longer necessary since we sysroot the toolchain in $(SYSROOT_DIR).
This patch has no effect on non-external toolchain builds.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
LIVE555 was installed on the build system and was recognized by configure:
Checking for LIVE555 Streaming Media libraries ... yes (using distribution version)
Later this led to a linker error:
ld: cannot find -lliveMedia
Disable LIVE555, since it's not available in Buildroot.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
pango likes to rerun it's configure script at make time, and it then
fails to find the correct pkg-config files (it finds the ones ins
STAGING_DIR) causing problems if they are not compatible.
Fix it by setting PKG_CONFIG_PATH in it's make environment.
Move stamp (dependency) files outside the (version specific) source
directories, so other packages can hardcode dependencies on them instead
of having to use <PACKAGE>_VERSION variables.
This is important as the variables in the make rules are evaluated when
the rules is seen, which might be before the dependent makefile is parsed
(and hence <PACKAGE>_VERSION variable is known, screwing up stuff.
The downside of this is that the package isn't automatically rebuilt
when the version changes (E.G. by a svn update) and you now also have to
remove the stamp files next to $(BUILD_DIR)/<PACKAGE>-* to force a rebuild.
This matches upstream tarball, doesn't screw up existing .config's with
BR2_PACKAGE_PKGCONFIG and makes sure the patch gets applied for target
compilation.
Generate pango.modules using the host tools instead of setting up an init
script to do it at run time. Also apply patches to host build to get
identical pango.modules file.
The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.
At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.
Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
Choosing between GPL or LGPL doesn't change the build process, so it's
sufficient to have a selection for the commercial license.
Also change the URLs to the licenses to the Qt web page, where the
exception for the LGPL is included.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Not particular useful until we add dbus-python (which depends on a fixed up
dbus-glib, which in turn depends on us starting to compile glib/dbus/dbus-glib
for the host as well) - But that's for another day.
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes#151.
* Avoid fips directory completely since it just installs source file cruft
inlib
* Point openssldir to a more friendly and common /etc/ssl rather than
/usr/lib/ssl
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes#145.
Current bind package is version 9.3.2 which is from the 9.3 branch and is
EOLed. It has many security bugs probably fixed in 9.3.6-P1 but since it
won't be supported for long it's probably metter to move on to a supported
branch. CVE-2009-0025, CVE-2008-1447, CVE-2008-0122, CVE-2007-2926 and
probably more. While at it migrate to Makefile.autotools.in too. Also
introduced an option for/not to install userland tools (dig, host, nslookup,
nsupdate).
[ Peter: don't install into staging ]
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes#5, #77, #141 and #143.
* Migrate php package to Makefile.autotools.in
* Make PCRE regex an option (previously forced on)
* Add calendar option from bug #77
* Add external sqlite3 option from bug #141
New option BR2_PACKAGE_PHP_PDO_SQLITE_EXTERNAL
* Add alternate php.ini configuration option from bug #5
Named BR2_PACKAGE_PHP_CONFIG and defaults to shipped config.
In most scenarios the shipped config isn't good enough, it has
a high memory limit for embedded for example.
* Changed some options from depends to select
Namely openssl, libxml2, zlib, gettext, gmp.
* Disabled some 'y' defaults to make things lighter by default
Namely libxml2, sqlite, pdo and pdo_sqlite.
* Made some of the extensions help text more verbose
Patch by Olaf Rempel <razzor@kopf-tisch.de>.
- bump version to 2.6.28
- fix download
- change compile ordering (build tc after ip)
- remove both binaries from target when cleaning up
[Peter: fixed target install strip]
This was forgotten when adding config options for zlib and bzip2. The
matroska plugin doesn't need these dependencies, they are optional.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
- php comes with it's own embedded sqlite, so no need to select sqlite
- disable largefile support for !BR2_LARGEFILE
- php somehow forgets to link with -ldl, breaking the sqlite extension.
Fix it by disabling the (unused?) modload support in sqlite.
php.net only offers downloads though a strange php script with the file name
embedded in the *MIDDLE* of the URL, which isn't compatible with the DOWNLOAD
macro. Fix it by reverting php.mk hunk of r24689 to go back to $(WGET).
This ofcourse means that the primary site / fallback mirror stuff isn't used.
Patch by Maxim Grigoriev.
GCC 4.3.x would link with the correct shared library versions, but without
any RPATH, so it ended up looking for then in /usr/lib/ at runtime.
This is less than good, as the version there might not be compatible, and
even worse for distributions like Ubuntu, which doesn't install those
libs by default, the build breaks.
Fix it by forcing static linking instead.
As discussed on the list. I suspect the ARM abi thing isn't needed anymore
now we use the correct abi in the first place, but I'll leave it in until
after the release.
I know that changing something as fundamental as mpfr this close to the
release isn't really ideal, but it's listed as the minimum version
for gcc 4.3.x:
http://gcc.gnu.org/install/prerequisites.html
Bernhard's tree has been using 2.3.2 since October, so the risk is probably
not that big though.
The GNU_TARGET_NAME symlink and target_utils location were not correctly
adjusted to match the move of the toolchain to $(STAGING_DIR)/usr,
creating dangling symlinks.
Make sure the developer is informed why a package is not
visable and that they need to have a NPTL enabled
toolchain.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Buildroot is adopting depends on for toolchain features and
select for packages. Make this change in this file.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Have been having various issues with multiple jobs (-jX) and building
autoconf. Turns out that v2.63 has fixed this. So bounce version
to a working version.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
The avahi-autoipd target install step adds /var/lib/avahi-autoipd as a
symlink to /tmp/avahi-autoipd, which is fine, except if your /var/lib is
already a symlink to /tmp (E.G. like the default target_skeleton is).
If that's the case, then you end up adding a /tmp/avahi-autoipd symlink
pointing to itself, causing subsequent builds to fail
(Too many levels of symbolic links in the ln -sf call). Fix it by simply
first removing the symlink if it's there.
This seems to be required to compile some of the inline asm.
This solves the following compiler errors:
h264.c: In function 'decode_cabac_residual':
h264.c:6158: warning: passing argument 4 of 'decode_significance_8x8_x86' discards qualifiers from pointer target type
cabac.h: In function 'get_cabac_noinline':
cabac.h:513: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
cabac.h:513: error: 'asm' operand has impossible constraints
While searching several weeks ago, I hit the following URL, which
unfortunately currently doesn't seem to work anymore and I can't
remember what the bug was about.
Also see http://bugs.uclibc.org/view.php?id=4604
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
This include file is only available, if uClibc is compiled with
UCLIBC_SUSV3_LEGACY defined and ftime() is not needed in this part of
mplayer at all.
This solves the following compiler error:
win32.c:67:23: error: sys/timeb.h: No such file or directory
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Also fix whitespace and use an existing variable for qmake.conf, which
was forgotten in r23828, though it's only commented out.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
