ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-06-18 15:28:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Get rid of CT_GMP_FILE and CT_MPFR_FILE.

Browse Source 
/trunk/scripts/build/gmp.sh  |   32    16    16     0 ++++++++++++++++----------------
 /trunk/scripts/build/mpfr.sh |   38    19    19     0 +++++++++++++++++++-------------------
 /trunk/scripts/crosstool.sh  |    2     0     2     0 --
 3 files changed, 35 insertions(+), 37 deletions(-)
This commit is contained in:
Yann E. MORIN"
2009-01-04 14:25:58 +00:00
parent e44e1a82e4
commit ba9fe0dec8
3 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/gmp.sh
View File

@ -12,12 +12,12 @@ if [ "${CT_GMP_MPFR}" = "y" ]; then
# Download GMP # Download GMP
do_gmp_get() { do_gmp_get() {
CT_GetFile "${CT_GMP_FILE}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
} }
# Extract GMP # Extract GMP
do_gmp_extract() { do_gmp_extract() {
CT_ExtractAndPatch "${CT_GMP_FILE}" CT_ExtractAndPatch "gmp-${CT_GMP_VERSION}"
} }
do_gmp() { do_gmp() {
@ -29,7 +29,7 @@ do_gmp() {
CT_DoLog EXTRA "Configuring GMP" CT_DoLog EXTRA "Configuring GMP"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_GMP_FILE}/configure" \ "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_HOST} \ --host=${CT_HOST} \
--prefix="${CT_PREFIX_DIR}" \ --prefix="${CT_PREFIX_DIR}" \
@ -61,7 +61,7 @@ do_gmp_target() {
CT_DoLog EXTRA "Configuring GMP" CT_DoLog EXTRA "Configuring GMP"
CFLAGS="${CT_CFLAGS_FOR_TARGET}" \ CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_GMP_FILE}/configure" \ "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_TARGET} \ --host=${CT_TARGET} \
--prefix=/usr \ --prefix=/usr \

10
scripts/build/mpfr.sh
View File

@ -12,13 +12,13 @@ if [ "${CT_GMP_MPFR}" = "y" ]; then
# Download MPFR # Download MPFR
do_mpfr_get() { do_mpfr_get() {
CT_GetFile "${CT_MPFR_FILE}" http://www.mpfr.org/mpfr-current/ \ CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/ \
http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/ http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
} }
# Extract MPFR # Extract MPFR
do_mpfr_extract() { do_mpfr_extract() {
CT_ExtractAndPatch "${CT_MPFR_FILE}" CT_ExtractAndPatch "mpfr-${CT_MPFR_VERSION}"
# OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
# same version number. Unfortunately, some tarballs of MPFR are not # same version number. Unfortunately, some tarballs of MPFR are not
@ -27,7 +27,7 @@ do_mpfr_extract() {
# and: http://sourceware.org/ml/crossgcc/2008-06/msg00005.html # and: http://sourceware.org/ml/crossgcc/2008-06/msg00005.html
# This hack is not bad per se, but the MPFR guys would be better not to # This hack is not bad per se, but the MPFR guys would be better not to
# do that in the future... # do that in the future...
CT_Pushd "${CT_SRC_DIR}/${CT_MPFR_FILE}" CT_Pushd "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}"
if [ ! -f .autotools.ct-ng ]; then if [ ! -f .autotools.ct-ng ]; then
CT_DoLog DEBUG "Re-building autotools files" CT_DoLog DEBUG "Re-building autotools files"
CT_DoExecLog ALL autoreconf -fi CT_DoExecLog ALL autoreconf -fi
@ -58,7 +58,7 @@ do_mpfr() {
CT_DoLog EXTRA "Configuring MPFR" CT_DoLog EXTRA "Configuring MPFR"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \ "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_HOST} \ --host=${CT_HOST} \
--prefix="${CT_PREFIX_DIR}" \ --prefix="${CT_PREFIX_DIR}" \
@ -91,7 +91,7 @@ do_mpfr_target() {
CT_DoLog EXTRA "Configuring MPFR" CT_DoLog EXTRA "Configuring MPFR"
CFLAGS="${CT_CFLAGS_FOR_TARGET}" \ CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_MPFR_FILE}/configure" \ "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_TARGET} \ --host=${CT_TARGET} \
--prefix=/usr \ --prefix=/usr \

2
scripts/crosstool.sh
View File

@ -85,8 +85,6 @@ CT_CC_CORE_EXTRA_CONFIG="${CT_ARCH_CC_CORE_EXTRA_CONFIG} ${CT_CC_CORE_EXTRA_CONF
CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}" CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
# Now, build up the variables from the user-configured options. # Now, build up the variables from the user-configured options.
CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}" CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}" CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"