From patchwork Wed Aug 6 19:17:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377372 X-Patchwork-Delegate: kiho@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 34B7E1400AA for ; Thu, 7 Aug 2014 05:18:35 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id E3D733FD91 for ; Wed, 6 Aug 2014 21:18:33 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by hugin.dotsrc.org (Postfix) with ESMTPS id 3CF963F9B1 for ; Wed, 6 Aug 2014 21:18:33 +0200 (CEST) Received: by mail-wi0-f171.google.com with SMTP id hi2so9472972wib.16 for ; Wed, 06 Aug 2014 12:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fkJwQwmXNudkj6UG32dSnyJlivI1KjmXlaAez1do5io=; b=fvk+PMNSfrDZXfGDt1ACrfdVM9I7Q198n99UaA5DgRu64S8KfOFNDXwyB3aNk/BZMB IOB//0PdvVJVoy1ttiyySqj+yDYsg9C61mLj7zuVuHQgmVmXafSYssU8h/l7/MnQhCQy qelOVP18Drqc2+VCDgAXbTRqRpWRsGNYJAbpnaz3xP3OZTaquKpqW3zjW4oeb/8BLeC1 5wrrILHI+PvomS8o1+C6ZZ4gX4acR5/bkLQY7j081IfgKmXFL2avYads6YBox6SIcciU Txle1jLZ8NEwtHHehDbJZMjRlqBs9Ah6OC901gWk0/pxp7d6xqHEZKKye7+j7oBDnES5 UUYw== X-Received: by 10.194.236.35 with SMTP id ur3mr17944158wjc.127.1407352712690; Wed, 06 Aug 2014 12:18:32 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id b9sm21033538wic.23.2014.08.06.12.18.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:18:31 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 11/18] expat: Fix potential issues with darwin/windows Date: Wed, 6 Aug 2014 21:17:57 +0200 Message-Id: <1407352684-7837-11-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> References: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/expat/expat-2.0.1/cdpath.patch | 10 ++++++++++ recipes/expat/expat-2.0.1/libtool-bindir.patch | 11 +++++++++++ recipes/expat/expat.inc | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 recipes/expat/expat-2.0.1/cdpath.patch create mode 100644 recipes/expat/expat-2.0.1/libtool-bindir.patch diff --git a/recipes/expat/expat-2.0.1/cdpath.patch b/recipes/expat/expat-2.0.1/cdpath.patch new file mode 100644 index 0000000..3940e93 --- /dev/null +++ b/recipes/expat/expat-2.0.1/cdpath.patch @@ -0,0 +1,10 @@ +--- expat-2.0.1/configure.in~orig 2013-05-16 11:37:20.936981596 +0200 ++++ expat-2.0.1/configure.in 2013-05-16 11:37:32.976981296 +0200 +@@ -31,6 +31,7 @@ + + AC_CONFIG_SRCDIR(Makefile.in) + AC_CONFIG_AUX_DIR(conftools) ++AC_CONFIG_MACRO_DIR(conftools) + + + dnl diff --git a/recipes/expat/expat-2.0.1/libtool-bindir.patch b/recipes/expat/expat-2.0.1/libtool-bindir.patch new file mode 100644 index 0000000..f48467e --- /dev/null +++ b/recipes/expat/expat-2.0.1/libtool-bindir.patch @@ -0,0 +1,11 @@ +--- expat-2.0.1/Makefile.in~orig 2013-05-16 12:27:58.376905480 +0200 ++++ expat-2.0.1/Makefile.in 2013-05-16 12:29:05.580903796 +0200 +@@ -117,7 +117,7 @@ + COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS) + CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS) + LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +-LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ ++LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) -bindir $(DESTDIR)$(bindir) $(LDFLAGS) -o $@ + LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ + LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@ + diff --git a/recipes/expat/expat.inc b/recipes/expat/expat.inc index 3c355d3..6544444 100644 --- a/recipes/expat/expat.inc +++ b/recipes/expat/expat.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://expat.sf.net/" RECIPE_TYPES = "machine native sdk" -inherit autotools make-vpath +inherit autotools-autoreconf make-vpath require conf/fetch/sourceforge.conf SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"