diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-31 21:13:38 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-01 10:04:44 +0200 |
| commit | 52c5215b8a3bfc61957d5c438940a70917a2bd93 (patch) | |
| tree | 12bd8d61c219a8d793686e54dfc524c0e9ac9e96 | |
| parent | e8202f805b2c91770e9e280505c03add59ed89df (diff) | |
| download | ptxdist-52c5215b8a3bfc61957d5c438940a70917a2bd93.tar.gz ptxdist-52c5215b8a3bfc61957d5c438940a70917a2bd93.tar.xz | |
[qt] fix host-missing-zlib
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/qt-embedded-linux-opensource-src-4.5.3/fix-host-zlib.diff | 35 | ||||
| -rw-r--r-- | patches/qt-embedded-linux-opensource-src-4.5.3/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.3/fix-host-zlib.diff b/patches/qt-embedded-linux-opensource-src-4.5.3/fix-host-zlib.diff new file mode 100644 index 000000000..eec941ed5 --- /dev/null +++ b/patches/qt-embedded-linux-opensource-src-4.5.3/fix-host-zlib.diff @@ -0,0 +1,35 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: fix bootstrap during cross compilation if host lacks zlib + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + src/tools/bootstrap/bootstrap.pri | 2 +- + src/tools/bootstrap/bootstrap.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: b/src/tools/bootstrap/bootstrap.pro +=================================================================== +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -95,7 +95,7 @@ macx: { + LIBS += -framework CoreServices + } + +-contains(QT_CONFIG, zlib) { ++contains(QT_CONFIG, zlib)|cross_compile { + INCLUDEPATH += ../../3rdparty/zlib + SOURCES+= \ + ../3rdparty/zlib/adler32.c \ +Index: b/src/tools/bootstrap/bootstrap.pri +=================================================================== +--- a/src/tools/bootstrap/bootstrap.pri ++++ b/src/tools/bootstrap/bootstrap.pri +@@ -51,7 +51,7 @@ hpux-acc*|hpuxi-acc* { + } + LIBS += -lbootstrap + } +-!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { ++!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { + unix:LIBS += -lz + # win32:LIBS += libz.lib + } diff --git a/patches/qt-embedded-linux-opensource-src-4.5.3/series b/patches/qt-embedded-linux-opensource-src-4.5.3/series index c1ae829cd..007d1090e 100644 --- a/patches/qt-embedded-linux-opensource-src-4.5.3/series +++ b/patches/qt-embedded-linux-opensource-src-4.5.3/series @@ -9,3 +9,4 @@ hide-cursor-at-startup.diff # dependency with ptxdist. #script-qtdbus.diff #designer-script.diff +fix-host-zlib.diff |