From patchwork Thu Jul 4 15:59:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 256954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id E4A0E2C008F for ; Fri, 5 Jul 2013 01:59:47 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B9B709A3A7; Thu, 4 Jul 2013 15:59:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xe6ugLX6a17c; Thu, 4 Jul 2013 15:59:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 978AA98679; Thu, 4 Jul 2013 15:59:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 742BD8F7A4 for ; Thu, 4 Jul 2013 15:59:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7AC948CAD7 for ; Thu, 4 Jul 2013 15:59:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NfzPV0iL1nRf for ; Thu, 4 Jul 2013 15:59:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id A97C389038 for ; Thu, 4 Jul 2013 15:59:40 +0000 (UTC) Received: from asgard (host21.186-125-225.telecom.net.ar [186.125.225.21]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r64FxXcm011219 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 4 Jul 2013 15:59:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1372953577; bh=T8hs4g8z0KiXNy9j+weEPkYy3Y1uO9TcfqU0/n1LjpI=; h=From:To:Cc:Subject:Date; b=cam04BJ83GGmF1qYjF2n2gcCeYbR5/KxJ4WF8fwK2c8pDPK2T6t8+2lHIvNM5P48i d5c7ApWDHvyscd7/6FxqkRG9F+Hu1a5hPLOhuUpia+6JM9Vm1rTtkkyYYCX7O3PERS iAPPPholOXohaWPvjE2vm0qB86mvM85xKOXLmYUI= Received: by asgard (sSMTP sendmail emulation); Thu, 04 Jul 2013 12:59:31 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 4 Jul 2013 12:59:31 -0300 Message-Id: <1372953571-15249-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] classpath: fix build errors with gmp support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net gmp support has a hardcoded /usr/include include PATH which causes breakage when there is a distribution gmp with development headers installed. Fixes: http://autobuild.buildroot.net/results/849/8497648c0b21390782eecc5b4aa91281bcf58ad6/ Signed-off-by: Gustavo Zacarias --- .../classpath/classpath-01-fix-gmp-include.patch | 46 ++++++++++++++++++++++ package/classpath/classpath.mk | 6 ++- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 package/classpath/classpath-01-fix-gmp-include.patch diff --git a/package/classpath/classpath-01-fix-gmp-include.patch b/package/classpath/classpath-01-fix-gmp-include.patch new file mode 100644 index 0000000..f7a3920 --- /dev/null +++ b/package/classpath/classpath-01-fix-gmp-include.patch @@ -0,0 +1,46 @@ +The GMP include is hardcoded to /usr/include causing obvious problems. + +From classpath CVS: +http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246 + +[Gustavo: ditch -L or libtool complains loudly] + +Signed-off-by: Gustavo Zacarias + +--- a/configure.ac 2010/01/30 01:33:50 1.245 ++++ b/configure.ac 2010/05/04 12:29:23 1.246 +@@ -752,10 +752,32 @@ + dnl __gmpz_mul_si for earlier versions (>= 3.1). + dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to + dnl change the name of the corresponding ac_ variable on lines 860... ++ AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. ++ Equivalent to --with-gmp-include=PATH/include ++ plus --with-gmp-lib=PATH/lib]) ++ AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) ++ AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) ++ + if test "x${COMPILE_GMP}" = xyes; then ++ AC_MSG_CHECKING([for GMP directories]) ++ if test "x$with_gmp" != x; then ++ gmplibs="-lgmp" ++ gmpinc="-I$with_gmp/include" ++ if test "x$with_gmp_include" != x; then ++ gmpinc="-I$with_gmp_include $gmpinc" ++ fi ++ if test "x$with_gmp_lib" != x; then ++ gmplibs="$gmplibs" ++ fi ++ else ++ with_gmp="/usr" ++ gmplibs="-lgmp" ++ gmpinc="-I/usr/include" ++ fi ++ AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc]) + AC_CHECK_LIB(gmp, __gmpz_mul_si, +- [GMP_CFLAGS=-I/usr/include +- GMP_LIBS=-lgmp ], ++ [GMP_CFLAGS="$gmpinc" ++ GMP_LIBS="$gmplibs" ], + [GMP_CFLAGS= + GMP_LIBS= ]) + AC_SUBST(GMP_CFLAGS) diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk index 62167aa..c305178 100644 --- a/package/classpath/classpath.mk +++ b/package/classpath/classpath.mk @@ -17,8 +17,10 @@ CLASSPATH_CONF_OPT = \ # classpath assumes qt runs on top of X11, but we # don't support qt4 on X11 CLASSPATH_CONF_OPT += --disable-qt-peer - CLASSPATH_DEPENDENCIES = host-pkgconf +CLASSPATH_AUTORECONF = YES +CLASSPATH_LICENSE = GPLv2+ with exception +CLASSPATH_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_ALSA_LIB),y) CLASSPATH_CONF_OPT += --enable-alsa @@ -28,7 +30,7 @@ CLASSPATH_CONF_OPT += --disable-alsa endif ifeq ($(BR2_PACKAGE_GMP),y) -CLASSPATH_CONF_OPT += --enable-gmp +CLASSPATH_CONF_OPT += --enable-gmp --with-gmp="$(STAGING_DIR)/usr" CLASSPATH_DEPENDENCIES += gmp else CLASSPATH_CONF_OPT += --disable-gmp