Commit a6337a4d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

mpfr: make it a proper package and bump to version 3.0.0-p8 



* Convert mpfr to a proper autotargets package
* Bump to version 3.0.0-p8
* Hook it up for binutils/gcc to use

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent eb8390d6

package/mpfr/Config.in

+2 −11
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBMPFR

config BR2_PACKAGE_MPFR

	bool "mpfr"

	default y if BR2_INSTALL_FORTRAN

	select BR2_PACKAGE_LIBGMP

	select BR2_PACKAGE_GMP

	help

	  C library for multiple-precision floating-point computations

	  with exact rounding.



	  http://www.mpfr.org/
 




config BR2_PACKAGE_LIBMPFR_HEADERS

	bool "mpfr headers for target"

	depends on BR2_PACKAGE_LIBMPFR

	select BR2_PACKAGE_LIBGMP_HEADERS

	help

	  Install the mpfr headers for the target.

package/mpfr/mpfr-3.0.0-p8.patch

0 → 100644
+1950 −0

File added.

Preview size limit exceeded, changes collapsed.

package/mpfr/mpfr.mk

+9 −117
Original line number Diff line number Diff line
@@ -3,122 +3,14 @@ 
# mpfr

#

#############################################################

MPFR_VERSION:=2.4.1

MPFR_PATCH:=patches

MPFR_PATCH_FILE:=mpfr-$(MPFR_VERSION).patch

MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2

MPFR_CAT:=$(BZCAT)

MPFR_SITE:=http://www.mpfr.org/mpfr-$(MPFR_VERSION)

MPFR_DIR:=$(TOOLCHAIN_DIR)/mpfr-$(MPFR_VERSION)

MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)

MPFR_BINARY:=libmpfr$(LIBTGTEXT)

MPFR_HOST_BINARY:=libmpfr$(HOST_LIBEXT)

MPFR_LIBVERSION:=1.2.0



# need patch

ifneq ($(MPFR_PATCH),)

MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE)

MPFR_VERSION = 3.0.0

MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)

MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2

MPFR_INSTALL_STAGING = YES

MPFR_DEPENDENCIES = gmp

MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)

HOST_MPFR_DEPENDENCIES = host-gmp



$(MPFR_PATCH_SOURCE):

	$(call DOWNLOAD,$(MPFR_SITE),$(MPFR_PATCH))

ifeq ($(DL_MODE),DOWNLOAD)

	mv $(DL_DIR)/$(MPFR_PATCH) $@

endif

endif



$(DL_DIR)/$(MPFR_SOURCE):

	 $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE))



$(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)

	$(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch

	$(CONFIG_UPDATE) $(@D)

ifneq ($(MPFR_PATCH),)

	toolchain/patch-kernel.sh $(MPFR_DIR) $(DL_DIR)/ $(MPFR_PATCH_FILE)

endif

	touch $@



$(MPFR_TARGET_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/usr/lib/$(GMP_BINARY)

	mkdir -p $(MPFR_TARGET_DIR)

	(cd $(MPFR_TARGET_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		$(MPFR_DIR)/configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		$(PREFERRED_LIB_FLAGS) \

		--with-gmp-build=$(GMP_TARGET_DIR) \

		$(DISABLE_NLS) \

	)

	touch $@



$(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.configured

	#$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MPFR_TARGET_DIR)

	$(MAKE) -C $(MPFR_TARGET_DIR)



$(STAGING_DIR)/usr/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY)

	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(MPFR_TARGET_DIR) install

	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)*



$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/usr/lib/libmpfr.a: $(STAGING_DIR)/usr/lib/$(MPFR_BINARY)

	cp -dpf $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/

ifeq ($(BR2_PACKAGE_LIBMPFR_HEADERS),y)

	cp -dpf $(STAGING_DIR)/usr/include/mpfr.h $(STAGING_DIR)/usr/include/mpf2mpfr.h \

		$(TARGET_DIR)/usr/include/

endif



.PHONY: libmpfr-source



libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)



libmpfr: $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT)

stage-libmpfr: $(STAGING_DIR)/usr/lib/$(MPFR_BINARY)



libmpfr-clean:

	rm -f $(TARGET_DIR)/usr/lib/libmpfr.* \

		$(TARGET_DIR)/usr/include/mpfr.h \

		$(TARGET_DIR)/usr/include/mpf2mpfr.h \

		$(STAGING_DIR)/usr/lib/libmpfr* $(STAGING_DIR)/usr/include/mpfr*

	-$(MAKE) -C $(MPFR_TARGET_DIR) clean



libmpfr-dirclean:

	rm -rf $(MPFR_TARGET_DIR)



MPFR_DIR2:=$(TOOLCHAIN_DIR)/mpfr-$(MPFR_VERSION)-host

MPFR_HOST_DIR:=$(TOOLCHAIN_DIR)/mpfr

$(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_HOST_BINARY)

	mkdir -p $(MPFR_DIR2)

	(cd $(MPFR_DIR2); \

		$(HOST_CONFIGURE_OPTS) \

		$(MPFR_DIR)/configure $(QUIET) \

		--prefix="$(MPFR_HOST_DIR)" \

		--build=$(GNU_HOST_NAME) \

		--host=$(GNU_HOST_NAME) \

		--disable-shared \

		--enable-static \

		--with-gmp=$(GMP_HOST_DIR) \

		$(DISABLE_NLS) \

	)

	touch $@



$(MPFR_HOST_DIR)/lib/libmpfr$(HOST_LIBEXT): $(MPFR_DIR2)/.configured

	$(MAKE) -C $(MPFR_DIR2) install



host-libmpfr: $(MPFR_HOST_DIR)/lib/$(MPFR_HOST_BINARY)

host-libmpfr-source: libmpfr-source

host-libmpfr-clean:

	rm -rf $(MPFR_HOST_DIR)

	-$(MAKE) -C $(MPFR_DIR2) clean

host-libmpfr-dirclean:

	rm -rf $(MPFR_HOST_DIR) $(MPFR_DIR2)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_LIBMPFR),y)

TARGETS+=libmpfr

endif
 
$(eval $(call AUTOTARGETS,package,mpfr))

$(eval $(call AUTOTARGETS,package,mpfr,host))

toolchain/binutils/binutils.mk

+5 −5
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ endif 
BINUTILS_HOST_PREREQ:=

BINUTILS_TARGET_PREREQ:=



BINUTILS_HOST_PREREQ:=host-gmp $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT)

HOST_SOURCE += host-gmp-source host-libmpfr-source

BINUTILS_HOST_PREREQ:=host-gmp host-mpfr

HOST_SOURCE += host-gmp-source host-mpfr-source



BINUTILS_TARGET_PREREQ:=gmp $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT)

BINUTILS_TARGET_PREREQ:=gmp mpfr



EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp=$(HOST_DIR)/usr

EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)"

EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr=$(HOST_DIR)/usr



BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp=$(STAGING_DIR)/usr

BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"

BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr=$(STAGING_DIR)/usr



ifeq ($(BR2_PACKAGE_LIBMPC),y)

BINUTILS_ADD_MPC = y

toolchain/gcc/gcc-uclibc-4.x.mk

+3 −3
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc 
endif



GCC_WITH_HOST_GMP = --with-gmp=$(HOST_DIR)/usr

GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)

HOST_SOURCE += host-gmp-source host-libmpfr-source

GCC_WITH_HOST_MPFR = --with-mpfr=$(HOST_DIR)/usr

HOST_SOURCE += host-gmp-source host-mpfr-source



ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)

GCC_WITH_HOST_MPC=--with-mpc=$(MPC_HOST_DIR)
@@ -120,7 +120,7 @@ GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran 
#GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so

#GCC_STAGING_PREREQ+=$(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so

GCC_WITH_TARGET_GMP = --with-gmp=$(STAGING_DIR)/usr

GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)"

GCC_WITH_TARGET_MPFR = --with-mpfr=$(STAGING_DIR)/usr

ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)

GCC_WITH_TARGET_MPC=--with-mpc="$(MPC_TARGET_DIR)"

endif