Compare commits

...

24 Commits
master ... 1.7

Author SHA1 Message Date
Yann E. MORIN" 7c0b0ad549 1.7: close branch 13 years ago
Yann E. MORIN" bd88acaa7b 1.7: update version to 1.7.2+hg 13 years ago
Yann E. MORIN" 81ef1431ee Tagging release 1.7.2 13 years ago
Yann E. MORIN" d3c8e1cd6b 1.7: update version to 1.7.2 13 years ago
Johannes Stezenbach 264bcd36c1 scripts: remove . from $PATH 13 years ago
Bart vdr. Meulen be34032551 complibs: fix using static companion libraries 13 years ago
Yann E. MORIN" 82d882fd28 configure: fix --mandir 13 years ago
Yann E. MORIN" 611b74e36a libc/uClibc: fix snapshots 13 years ago
Yann E. MORIN" 1e2788c044 scripts/finish: do not try to symlink if sed expr is a no-op 13 years ago
Yann E. MORIN" caa0b3abe0 1.7: update version to 1.7.1+hg 13 years ago
Yann E. MORIN" 267cce5386 Tagging release 1.7.1 13 years ago
Yann E. MORIN" 02c52f01d4 1.7: update version to 1.7.1 13 years ago
Yann E. MORIN" 1bbab712ab scripts/wrapper: fix wrong test when checking access to the reall tool 13 years ago
Yann E. MORIN" 41029ebf7d complibs/gmp: 5.0.0 misses 'EXPERIMENTAL' in the prompt 13 years ago
Yann E. MORIN" c3d0ff0ec9 cc/gcc: fix headers copy for core static 13 years ago
Titus von Boxberg 81dee3a87f crosstool-NG.sh: suppress failure message from uname -o 13 years ago
Yann E. MORIN" eb32b1d2aa Merge. 13 years ago
Yann E. MORIN" ffbddc3933 Revert changeset e7f7220b5ba2 13 years ago
Yann E. MORIN" 255ff96425 Revert changeset d341be24dc68 13 years ago
Yann E. MORIN" 28c451abe0 cc/gcc: add latest version 13 years ago
Yann E. MORIN" 93f2e86a82 kernel/linux: update versions list 13 years ago
Yann E. MORIN" ff104ad07b 1.7: update version to 1.7.0+hg 13 years ago
Yann E. MORIN" ca47c2c9a7 Tagging release 1.7.0 13 years ago
Yann E. MORIN" de5e7351b3 1.7: create maintenance branch, update version to 1.7.0 13 years ago
  1. 3
      .hgtags
  2. 2
      .version
  3. 11
      Makefile.in
  4. 2
      config/companion_libs/gmp.in
  5. 2
      configure
  6. 5
      scripts/build/cc/gcc.sh
  7. 6
      scripts/build/internals.sh
  8. 23
      scripts/build/libc/uClibc.sh
  9. 6
      scripts/crosstool-NG.sh.in
  10. 18
      scripts/functions
  11. 2
      scripts/wrapper.c

3
.hgtags

@ -30,3 +30,6 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
3a7ac3dd859d2f5c2cd097739df53850402ba2f7 crosstool-ng-1.7.0
715b711da3ab46b04e8253e84b2bab2423bb0d5f crosstool-ng-1.7.1
2d3a2b3f4a0c6af7a6c8f19de4ac3510bb2a9c79 crosstool-ng-1.7.2

2
.version

@ -1 +1 @@
hg
1.7.2+hg

11
Makefile.in

@ -53,6 +53,11 @@ grep := @@grep@@
make := @@make@@
sed := @@sed@@
###############################################################################
# Non-configure variables
MAN_SECTION := 1
MAN_SUBDIR := /man$(MAN_SECTION)
###############################################################################
# Sanity checks
@ -224,11 +229,11 @@ install-doc: $(DESTDIR)$(DOCDIR)
$(install) -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \
done
install-man: $(DESTDIR)$(MANDIR)
install-man: $(DESTDIR)$(MANDIR)$(MAN_SUBDIR)
@echo " INST 'ct-ng.1.gz'"
@$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)"
@$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)$(MAN_SUBDIR)"
$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)):
$(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)$(MAN_SUBDIR)):
@echo " MKDIR '$@'"
@$(install) -m 755 -d "$@"

2
config/companion_libs/gmp.in

@ -8,7 +8,7 @@ choice
config GMP_V_5_0_1
bool
prompt "5.0.1"
prompt "5.0.1 (EXPERIMENTAL)"
depends on EXPERIMENTAL
config GMP_V_4_3_2

2
configure vendored

@ -408,7 +408,7 @@ printf "${VERSION}\n"
[ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib"
[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc"
[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man"
# Install support files in our own sub-dir, so as not to mangle (system)
# files and dirs, but only if not --local

5
scripts/build/cc/gcc.sh

@ -134,8 +134,7 @@ do_cc_core() {
if [ "${copy_headers}" = "y" ]; then
CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
CT_DoExecLog ALL mkdir -p "${core_prefix_dir}/${CT_TARGET}/include"
CT_DoExecLog ALL cp -r "${CT_HEADERS_DIR}"/* "${core_prefix_dir}/${CT_TARGET}/include"
CT_DoExecLog ALL cp -a "${CT_HEADERS_DIR}" "${core_prefix_dir}/${CT_TARGET}/include"
fi
CT_DoLog EXTRA "Configuring ${mode} core C compiler"
@ -397,7 +396,7 @@ do_cc() {
# Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
# to call the C compiler with the same, somewhat canonical name.
# check whether compiler has an extension
file="$( ls -1 "${CT_TARGET}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"

6
scripts/build/internals.sh

@ -31,7 +31,11 @@ do_finish() {
fi
if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
_t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
CT_DoExecLog ALL ln -sv "${t}" "${_t}"
if [ "${_t}" = "${t}" ]; then
CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
else
CT_DoExecLog ALL ln -sv "${t}" "${_t}"
fi
fi
done
CT_Popd

23
scripts/build/libc/uClibc.sh

@ -19,14 +19,29 @@ do_libc_get() {
return 0
}
libc_uclibc_src_dir() {
if [ -z "${CT_LIBC_V_snapshot}" \
-a -z "${CT_LIBC_V_specific_date}" \
]; then
echo "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
else
echo "${CT_SRC_DIR}/uClibc"
fi
}
# Extract uClibc
do_libc_extract() {
CT_Extract "uClibc-${CT_LIBC_VERSION}"
CT_Patch "uClibc" "${CT_LIBC_VERSION}"
# Don't patch snapshots
if [ -z "${CT_LIBC_V_snapshot}" \
-a -z "${CT_LIBC_V_specific_date}" \
]; then
CT_Patch "uClibc" "${CT_LIBC_VERSION}"
fi
# uClibc locales
if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
CT_Pushd "$(libc_uclibc_src_dir)/extra/locale"
CT_Extract nochdir "uClibc-locale-030818"
CT_Patch nochdir "uClibc" "locale-030818"
CT_Popd
@ -60,7 +75,7 @@ do_libc_headers() {
# Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir"
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \
"${CT_BUILD_DIR}/build-libc-headers"
cd "${CT_BUILD_DIR}/build-libc-headers"
@ -100,7 +115,7 @@ do_libc() {
# Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir"
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \
"${CT_BUILD_DIR}/build-libc"
cd "${CT_BUILD_DIR}/build-libc"

6
scripts/crosstool-NG.sh.in

@ -28,6 +28,9 @@
# Overide the locale early, in case we ever translate crosstool-NG messages
[ -z "${CT_NO_OVERIDE_LC_MESSAGES}" ] && export LC_ALL=C
# remove . from PATH since it can cause gcc build failures
CT_SanitizePath
# Some sanity checks in the environment and needed tools
CT_DoLog INFO "Performing some trivial sanity checks"
CT_TestAndAbort "Don't set LD_LIBRARY_PATH. It screws up the build." -n "${LD_LIBRARY_PATH}"
@ -194,8 +197,7 @@ CT_SYS_HOSTNAME=$(hostname -f 2>/dev/null || true)
CT_SYS_HOSTNAME="${CT_SYS_HOSTNAME:-$(uname -n)}"
CT_SYS_KERNEL=$(uname -s)
CT_SYS_REVISION=$(uname -r)
# uname -o is a GNU Extension. Others lack '-o' --> use System name for OS name.
CT_SYS_OS=$(uname -o || uname -s)
CT_SYS_OS=$(uname -s)
CT_SYS_MACHINE=$(uname -m)
CT_SYS_PROCESSOR=$(uname -p)
CT_SYS_GCC=$(gcc -dumpversion)

18
scripts/functions

@ -137,6 +137,24 @@ CT_DoEnd()
CT_DoLog ${level:-INFO} "(elapsed: ${elapsed_min}:${elapsed_sec}.${elapsed_csec})"
}
# Remove entries referring to ., /tmp and non-existing directories from $PATH
# Usage: CT_SanitizePath
CT_SanitizePath() {
local new
local tmp
local IFS=:
for p in $PATH; do
# Replace any occurence of . with $(pwd -P)
# Use /tmp as a default if the directory is non-existent
# Do not add /tmp in the PATH
tmp="$( cd /tmp; cd "${p}" 2>/dev/null || true; pwd -P )"
if [ "${tmp}" != "/tmp" ]; then
new="${new}${new:+:}${p}"
fi
done
PATH="${new}"
}
# Abort the execution with an error message
# Usage: CT_Abort <message>
CT_Abort() {

2
scripts/wrapper.c

@ -66,7 +66,7 @@ int main( int argc,
if( stat( testname, &st ) == 0 ) {
/* OK, exists. Is it a regular file, or a
* symlink, which the current user may execute? */
if( S_ISREG( st.st_mode ) && ! access( testname, X_OK || R_OK ) ) {
if( S_ISREG( st.st_mode ) && ! access( testname, X_OK | R_OK ) ) {
fullname = strdup( testname );
break;
}

Loading…
Cancel
Save