Browse Source
qt4: fixed to not install /include/WebCore/libdummy.prl if no OUTPUT_DIR is set
user/chris/wip/linux37
Christian Wiese
11 years ago
committed by
Christian Wiese
Christian Wiese
1 changed files with 50 additions and 0 deletions
Unified View
Diff Options
@ -0,0 +1,50 @@ |
|||||
|
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# |
||||
|
# Filename: package/.../qt4/qt4-webkit2-set-OUTPUT_DIR-value-if-empty.patch |
||||
|
# Copyright (C) 2013 The OpenSDE Project |
||||
|
# |
||||
|
# More information can be found in the files COPYING and README. |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# --- SDE-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001 |
||||
|
From: Martin Jansa <Martin.Jansa@gmail.com> |
||||
|
Date: Tue, 1 May 2012 07:48:15 +0200 |
||||
|
Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty |
||||
|
|
||||
|
Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem |
||||
|
now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl |
||||
|
|
||||
|
First reported here: |
||||
|
http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html |
||||
|
|
||||
|
Upstream-Status: Pending |
||||
|
|
||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
||||
|
---
|
||||
|
src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++ |
||||
|
1 file changed, 2 insertions(+) |
||||
|
|
||||
|
diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
|
||||
|
index 006a88c..5e17193 100644
|
||||
|
--- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
|
||||
|
+++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
|
||||
|
@@ -3,6 +3,8 @@ TARGET = dummy
|
||||
|
|
||||
|
CONFIG -= debug_and_release |
||||
|
|
||||
|
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
|
||||
|
+
|
||||
|
CONFIG(standalone_package) { |
||||
|
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated |
||||
|
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated |
||||
|
--
|
||||
|
1.8.0 |
||||
|
|
||||