From 716a43b4e0fc304018a95c88a185d7326b074141 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jan 2014 18:34:51 +0100 Subject: [PATCH] mpfr: convert to new package format, move package Signed-off-by: Stephan Raue --- packages/devel/binutils/package.mk | 2 +- packages/devel/mpc/package.mk | 2 +- .../math/mpfr/meta => devel/mpfr/package.mk} | 21 ++++++++-- packages/lang/gcc/package.mk | 6 +-- packages/toolchain/math/mpfr/build | 42 ------------------- 5 files changed, 22 insertions(+), 51 deletions(-) rename packages/{toolchain/math/mpfr/meta => devel/mpfr/package.mk} (79%) delete mode 100755 packages/toolchain/math/mpfr/build diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk index c4ee0b2698..516811f5a7 100644 --- a/packages/devel/binutils/package.mk +++ b/packages/devel/binutils/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/binutils/binutils.html" PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="" -PKG_BUILD_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host gmp:host mpfr cloog:host ppl:host" +PKG_BUILD_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host gmp:host mpfr:host cloog:host ppl:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="binutils: A GNU collection of binary utilities" diff --git a/packages/devel/mpc/package.mk b/packages/devel/mpc/package.mk index 1ce4851968..46856a7f96 100644 --- a/packages/devel/mpc/package.mk +++ b/packages/devel/mpc/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="LGPL" PKG_SITE="http://www.multiprecision.org" PKG_URL="http://www.multiprecision.org/mpc/download/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="" -PKG_BUILD_DEPENDS_HOST="ccache:host gmp:host mpfr" +PKG_BUILD_DEPENDS_HOST="ccache:host gmp:host mpfr:host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="mpc: A C library for the arithmetic of high precision complex numbers" diff --git a/packages/toolchain/math/mpfr/meta b/packages/devel/mpfr/package.mk similarity index 79% rename from packages/toolchain/math/mpfr/meta rename to packages/devel/mpfr/package.mk index d4f4528194..5633849cdd 100644 --- a/packages/toolchain/math/mpfr/meta +++ b/packages/devel/mpfr/package.mk @@ -23,12 +23,25 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.mpfr.org/" PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache:host gmp:host" +PKG_DEPENDS_HOST="" +PKG_BUILD_DEPENDS_HOST="ccache:host gmp:host" PKG_PRIORITY="optional" -PKG_SECTION="toolchain/math" +PKG_SECTION="devel" PKG_SHORTDESC="mpfr: A C library for multiple-precision floating-point computations with exact roundi" PKG_LONGDESC="The MPFR library is a C library for multiple-precision floating-point computations with exact rounding (also called correct rounding). It is based on the GMP multiple-precision library. The main goal of MPFR is to provide a library for multiple-precision floating-point computation which is both efficient and has well-defined semantics. It copies the good ideas from the ANSI/IEEE-754 standard for double-precision floating-point arithmetic (53-bit mantissa)." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ + --prefix=$ROOT/$TOOLCHAIN \ + --enable-shared \ + --with-gmp-lib=$ROOT/$TOOLCHAIN/lib \ + --with-gmp-include=$ROOT/$TOOLCHAIN/include" + +pre_build_host() { + ( cd $PKG_BUILD + libtoolize + autoreconf -vif + ) +} diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index 210793785c..370d9249f4 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -24,10 +24,10 @@ PKG_LICENSE="GPL" PKG_SITE="http://gcc.gnu.org/" PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc:host cloog:host ppl:host" -PKG_BUILD_DEPENDS_BOOTSTRAP="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc:host cloog:host ppl:host" +PKG_BUILD_DEPENDS="ccache:host autoconf-2.64 binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host" +PKG_BUILD_DEPENDS_BOOTSTRAP="ccache:host autoconf-2.64 binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host" PKG_BUILD_DEPENDS_TARGET="gcc:host" -PKG_BUILD_DEPENDS_HOST="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc:host cloog:host ppl:host eglibc" +PKG_BUILD_DEPENDS_HOST="ccache:host autoconf-2.64 binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc" PKG_PRIORITY="optional" PKG_SECTION="lang" PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)" diff --git a/packages/toolchain/math/mpfr/build b/packages/toolchain/math/mpfr/build deleted file mode 100755 index b890943452..0000000000 --- a/packages/toolchain/math/mpfr/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it 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. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -. config/options $1 - -setup_toolchain host - -cd $PKG_BUILD - -libtoolize -autoreconf -vif - -mkdir -p objdir -cd objdir - -../configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --target=$TARGET_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --enable-shared \ - --with-gmp-lib="$ROOT/$TOOLCHAIN/lib" \ - --with-gmp-include="$ROOT/$TOOLCHAIN/include" \ - -make -make install