From patchwork Sat Nov 3 12:33:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 196834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DE342C00DB for ; Sat, 3 Nov 2012 23:33:57 +1100 (EST) Received: from localhost ([::1]:58641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUcvD-0002lU-9q for incoming@patchwork.ozlabs.org; Sat, 03 Nov 2012 08:33:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUcv4-0002lI-WE for qemu-devel@nongnu.org; Sat, 03 Nov 2012 08:33:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUcv3-0005YQ-I2 for qemu-devel@nongnu.org; Sat, 03 Nov 2012 08:33:46 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:46843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUcv3-0005Y7-8Q for qemu-devel@nongnu.org; Sat, 03 Nov 2012 08:33:45 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so2910428pad.4 for ; Sat, 03 Nov 2012 05:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=oWUy59KY5Qz3U+YNqqUUIqa7uuhI1zprjNQgGvLTmQ4=; b=QwPvx2EqcpCWkVE6cgmSvt9TARITk+WXFAo0ZyzkWJFCGxS91PfyORYzxjb7X1KnUx pU5Zj0XKUpOVgsCiySeBrdT+xGh4TYvzA3jGEvApmitRTnMiPHbeWkdbo6BZVfxPjWC3 fHfzO+YtECRS7rjqhglSlW2xCpAwVrpJSUCmugGSxYvE5S+Ybx8XYZMO6zVyeevtGMOH YEPTRtfgjmNy/su5BAbmCyo0T9rIlBqnA3bqFiKkFlh1Re+e1YwzqkojlrWp1cd86Vx2 Kjup23mrxIUzTx/22ESlJn5qQ8Qu+4nCvKgLAeC37OoXV7kbU6BIXGP49U0eYRWqnHlx gbyA== Received: by 10.68.204.103 with SMTP id kx7mr15194760pbc.33.1351946024444; Sat, 03 Nov 2012 05:33:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.49.101 with HTTP; Sat, 3 Nov 2012 05:33:24 -0700 (PDT) In-Reply-To: <5093F580.6080503@suse.de> References: <1351775057-3938-1-git-send-email-kraxel@redhat.com> <87r4odp17j.fsf@codemonkey.ws> <5093F17B.9090408@suse.de> <5093F580.6080503@suse.de> From: Blue Swirl Date: Sat, 3 Nov 2012 12:33:24 +0000 Message-ID: To: =?UTF-8?Q?Andreas_F=C3=A4rber?= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: qemu-devel@nongnu.org, Gerd Hoffmann , Anthony Liguori , Alexander Graf Subject: Re: [Qemu-devel] [PULL 00/22] console cleanups & pixman rendering X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Fri, Nov 2, 2012 at 4:32 PM, Andreas Färber wrote: > Am 02.11.2012 17:14, schrieb Andreas Färber: >> Am 01.11.2012 20:33, schrieb Anthony Liguori: >>> Gerd Hoffmann writes: >>> >>>> Hi, >>>> >>>> Sitting on these too long already. Series has been on the list a while >>>> back, only splitted into two parts (separate "console cleanups" series >>>> carrying patches 1-8). Patch 11 was updated according to Paolos >>>> suggestion, otherwise the patches are unmodified. >>>> >>>> please pull, >>>> Gerd >>> >>> Pulled. Thanks. >> >> Getting this on SLES 11 SP2 s390x (pixman 0.16.0): >> >> cc1: warnings being treated as errors >> In file included from /home/andreas/qemu-s390/qemu-pixman.h:4, >> from /home/andreas/qemu-s390/console.h:5, >> from /home/andreas/qemu-s390/qemu-timer.c:28: >> /usr/include/pixman-1/pixman.h:225: error: redundant redeclaration of >> ‘pixman_transform_from_pixman_f_transform’ >> /usr/include/pixman-1/pixman.h:221: error: previous declaration of >> ‘pixman_transform_from_pixman_f_transform’ was here >> make: *** [qemu-timer.o] Fehler 1 >> make: *** Warte auf noch nicht beendete Prozesse... >> >> Any idea how to resolve? > > So, it seems that our pixman 0.16.0 header has a genuine redundant > declaration, not influenced by qemu-pixman.h. I worked around it by > manually changing -Wredundant-decl to -Wno-redundant-decl in configure, > similar to what some FreeBSD versions needed. Suggestions for a real > warnings-fix or configure-detection of incompatible headers appreciated! Maybe adding #pragma GCC diagnostic ignored "-Wredundant-decl" #pragma GCC diagnostic error "-Wredundant-decl" to qemu-pixman.h. I still have another problem, out of tree build with submodule version does not work (mingw). With this change it almost works, but ranlib is not propagated and tests (if not disabled) fail. CCLD clip-test.exe i586-mingw32msvc-gcc: unrecognized option '-pthread' i586-mingw32msvc-gcc: unrecognized option '-pthread' /usr/lib/gcc/i586-mingw32msvc/4.4.4/../../../../i586-mingw32msvc/bin/ld: cannot find -lgtk-x11-2.0 > > Andreas > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg > diff --git a/Makefile b/Makefile index ca14a21..15a3080 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ subdir-pixman: pixman/Makefile $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; $(SRC_PATH)/pixman/configure --disable-shared --enable-static) + (cd pixman; CC=$(CC) LD=$(LD) AR=$(AR) NM=$(NM) RANLIB=$(RANLIB) $(SRC_PATH)/pixman/configure --disable-shared --enable-static) $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) diff --git a/configure b/configure index 8e70cbb..15cfc08 100755 --- a/configure +++ b/configure @@ -252,9 +252,11 @@ done cc="${CC-${cross_prefix}gcc}" ar="${AR-${cross_prefix}ar}" +nm="${NM-${cross_prefix}nm}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" libtool="${LIBTOOL-${cross_prefix}libtool}" +ranlib="${RANLIB-${cross_prefix}ranlib}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" @@ -2121,8 +2123,8 @@ else echo " git submodule update --init pixman" exit 1 fi - pixman_cflags="-I${source_path}/pixman/pixman" - pixman_libs="-Lpixman/pixman/.libs -lpixman-1" + pixman_cflags="-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman" + pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1" fi QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" libs_softmmu="$libs_softmmu $pixman_libs" @@ -3634,8 +3636,10 @@ echo "CC_I386=$cc_i386" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak echo "OBJCC=$objcc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak +echo "NM=$nm" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak +echo "RANLIB=$RANLIB" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "LIBTOOL=$libtool" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak Hacked pixman/Makefile.in: --- pixman/Makefile.in~ 2012-11-03 07:41:28.000000000 +0000 +++ pixman/Makefile.in 2012-11-03 12:27:05.000000000 +0000 @@ -269,7 +269,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = pixman test +SUBDIRS = pixman pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pixman-1.pc GPGKEY = 6FF7C1A8