From patchwork Mon Jul 15 23:06:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Solomon Peachy X-Patchwork-Id: 259300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 9BDC02C017C for ; Tue, 16 Jul 2013 09:07:15 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=HsRNO8zHfz17Eh6+aGbODZDCvvzvD Be2eXB/bM8bFFZbvgUgRqJtYJDO1JhkdoUn75ODf7d7HNb0usU2l4XXHf5J5+pEy L9eMJqQDgBWQZlg5jKTNHUjtcjTnZfeEeJjvxhNB/fx6NinzUUwikG0JR8DFHM1A 6Zva+//Gpfc5Kw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=BBBqCZs3rfMfh38ffUPLVMmSITg=; b=H9W T76b0NQprVbdCN4EDt1TfxvEOA9NvinW7Hqo731rgLec/FmrU6KM1EejS77zF8x0 K0Jdp9ZUi8lH73hMs0Dc+pXyo6g0ixap2/LNJwyf9SILvyLqGuHAHHf16jUWtmhl Ucmq7Jq/SCn+EN1Q7D7K8pX6I/+K1gnyRBIpspCE= Received: (qmail 5430 invoked by alias); 15 Jul 2013 23:07:08 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 5415 invoked by uid 89); 15 Jul 2013 23:07:07 -0000 X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_20, KHOP_PGP_SIGNED, RDNS_NONE, TW_BF, TW_BG autolearn=no version=3.3.1 Received: from Unknown (HELO stuffed.shaftnet.org) (162.17.110.37) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 15 Jul 2013 23:07:07 +0000 Received: from stuffed.shaftnet.org (localhost [127.0.0.1]) by stuffed.shaftnet.org (8.14.7/8.14.5) with ESMTP id r6FN6vWm025412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 15 Jul 2013 19:06:57 -0400 Received: (from pizza@localhost) by stuffed.shaftnet.org (8.14.7/8.14.7/Submit) id r6FN6vON025411 for crossgcc@sourceware.org; Mon, 15 Jul 2013 19:06:57 -0400 Date: Mon, 15 Jul 2013 19:06:57 -0400 From: Solomon Peachy To: crossgcc@sourceware.org Subject: [PATCHv2] Fix crosstool-ng build when local system has libgmp already installed Message-ID: <20130715230656.GB23382@shaftnet.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Found: No - Solomon diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400 @@ -0,0 +1,26 @@ +diff -aur ppl-0.10-orig/configure ppl-0.10/configure +--- ppl-0.10-orig/configure 2008-11-04 04:37:00.000000000 -0500 ++++ ppl-0.10/configure 2013-07-15 18:48:26.688013150 -0400 +@@ -15162,6 +15162,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + + +diff -aur ppl-0.10-orig/m4/ac_check_gmp.m4 ppl-0.10/m4/ac_check_gmp.m4 +--- ppl-0.10-orig/m4/ac_check_gmp.m4 2008-10-22 07:43:22.000000000 -0400 ++++ ppl-0.10/m4/ac_check_gmp.m4 2013-07-15 18:48:26.669013816 -0400 +@@ -31,6 +31,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + dnl Check how to link with libgmp. + AC_LIB_LINKFLAGS([gmp]) diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400 @@ -0,0 +1,24 @@ +--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 +@@ -32,6 +32,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + AC_ARG_WITH(gmp-build, + AS_HELP_STRING([--with-gmp-build=DIR], +--- a/configure~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/configure 2013-07-10 19:57:35.894457259 -0400 +@@ -10217,6 +10217,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + + # Check whether --with-gmp-build was given. diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400 @@ -0,0 +1,24 @@ +--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 +@@ -32,6 +32,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + AC_ARG_WITH(gmp-build, + AS_HELP_STRING([--with-gmp-build=DIR], +--- a/configure~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/configure 2013-07-10 19:57:35.894457259 -0400 +@@ -10217,6 +10217,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + + # Check whether --with-gmp-build was given. diff -r 58ca31386bfb -r 188c85288c03 patches/ppl/0.11/200-fix-build-with-local-gmp.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ppl/0.11/200-fix-build-with-local-gmp.patch Mon Jul 15 19:02:06 2013 -0400 @@ -0,0 +1,24 @@ +--- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 +@@ -32,6 +32,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + AC_ARG_WITH(gmp-build, + AS_HELP_STRING([--with-gmp-build=DIR], +--- a/configure~ 2011-02-27 04:07:47.000000000 -0500 ++++ b/configure 2013-07-10 19:57:35.894457259 -0400 +@@ -10217,6 +10217,9 @@ + with_libgmpxx_prefix="$with_libgmp_prefix" + fi + fi ++CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" ++CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" ++LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" + + + # Check whether --with-gmp-build was given.