Compare commits

...

30 Commits
master ... 1.5

Author SHA1 Message Date
Yann E. MORIN" c01088cad0 1.5: close maintenance branch 13 years ago
Yann E. MORIN" 0ba319a247 1.5: update version string to 1.5.3+hg 13 years ago
Yann E. MORIN" c5511821e5 Tagging release 1.5.3 13 years ago
Yann E. MORIN" 4d21e3ee97 i1.5: update version string to 1.5.3 13 years ago
Joachim Nilsson 52583dbb14 libc/uClibc: add patch to fix IP frames on BE targets 13 years ago
Yann E. MORIN" f6b0157234 libc/uClibc: do not mangle ARM {E,O}ABI when ARCH != ARM 13 years ago
Yann E. MORIN" bcd6129f14 debug/tools: set the ncurses extension to .tar.gz 13 years ago
Yann E. MORIN" 02768432e3 config: fix generated config files when GREP_OPTIONS set --color=always 13 years ago
Yann E. MORIN" f96424f56f scripts: check for, and warn about an unset CT_PREFIX_DIR 13 years ago
Yann E. MORIN" 5b4be4bafd linux/kernel: fix version numbers 13 years ago
Yann E. MORIN" 454429bc7c configure: install in a sub-dir of --libdir and --docdir 13 years ago
Yann E. MORIN" 7d5787d95c 1.5: update version string to 1.5.2+hg 13 years ago
Yann E. MORIN" 1fbfd638ad Added tag crosstool-ng-1.5.2 for changeset bb01f4294cf2 13 years ago
Yann E. MORIN" 7fec902a6f 1.5: update version string to 1.5.2 13 years ago
Frederic Roussel" 785751e7f3 Fix typos and adjust some documentation. 13 years ago
Doug Kehn c3859e978c libc/uClibc: add new patch to fix NULL pointer dereference 13 years ago
Yann E. MORIN" dc3fef8d25 scripts: fix updating config.{sub,guess} 13 years ago
Zoltan Devai 0256c1b0cc libc/uClibc: fix building on system with recent glibc 13 years ago
Yann E. MORIN" 6c3a08411d libc/newlib: fix host/target confusion 13 years ago
Yann E. MORIN" b3bd2dd87a 1.5: update to 1.5.0+hg 13 years ago
Yann E. MORIN" 9862563c8d Tagging release 1.5.1 13 years ago
Yann E. MORIN" c8bee3189e 1.5: update version to 1.5.1 13 years ago
fr frasc 689f7e85cf scripts/functions: Fix a variable name. 13 years ago
Yann E. MORIN" de81aff9d9 version: update to 1.5.0+hg 14 years ago
Yann E. MORIN" e9f935be04 configure: force using the C locale to check messages 14 years ago
Yann E. MORIN" 61fdb0e510 configure: fix --with-foo=/path/to/foo 14 years ago
Yann E. MORIN" 68fba106a2 samples: fix the avr32-unknown-none sample 14 years ago
Yann E. MORIN" 28bb718b6f Tagging release 1.5.0 14 years ago
Yann E. MORIN" 496fc57007 1.5: update version to 1.5.0 14 years ago
Yann E. MORIN" c2b15cf5a6 1.5: create maintenance branch for the 1.5 series 14 years ago
  1. 4
      .hgtags
  2. 2
      .version
  3. 2
      Makefile.in
  4. 12
      config/kernel/linux.in
  5. 17
      configure
  6. 9
      ct-ng.in
  7. 10
      docs/overview.txt
  8. 30
      patches/uClibc/0.9.30.1/180-getline-conflict.patch
  9. 12
      patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch
  10. 224
      patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch
  11. 23
      samples/avr32-unknown-none/crosstool.config
  12. 2
      samples/samples.mk
  13. 2
      scripts/build/debug/300-gdb.sh
  14. 8
      scripts/build/libc/newlib.sh
  15. 12
      scripts/build/libc/uClibc.sh
  16. 3
      scripts/crosstool-NG.sh.in
  17. 2
      scripts/functions
  18. 6
      scripts/scripts.mk

4
.hgtags

@ -30,3 +30,7 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
a32dc48671c3d9bd2c36942ee1174ec45fde7599 crosstool-ng-1.5.0
b904a1e0da1797a094c38bba1e5510ca9fb40441 crosstool-ng-1.5.1
bb01f4294cf2e157dcd0e0add5342c213a963e0e crosstool-ng-1.5.2
6af824c6214e44369602de4d33168140976f4467 crosstool-ng-1.5.3

2
.version

@ -1 +1 @@
hg
1.5.3+hg

2
Makefile.in

@ -129,7 +129,7 @@ docs/ct-ng.1.gz: docs/ct-ng.1
# We create a script fragment that is parseable from inside a Makefile,
# but also from inside a shell script, hence the reason why we don't
# use := to set varaibles, although that will incur a (very small)
# use := to set variables, although that will incur a (very small)
# penalty from the Makefile that includes it (due to re-evaluation at
# each call).
paths.mk:

12
config/kernel/linux.in

@ -42,13 +42,13 @@ config KERNEL_V_2_6_31
bool
prompt "2.6.31"
config KERNEL_V_3_6_30_8
config KERNEL_V_2_6_30_8
bool
prompt "3.6.30.8"
prompt "2.6.30.8"
config KERNEL_V_3_6_30_7
config KERNEL_V_2_6_30_7
bool
prompt "3.6.30.7"
prompt "2.6.30.7"
config KERNEL_V_2_6_30_6
bool
@ -149,8 +149,8 @@ config KERNEL_VERSION
# CT_INSERT_VERSION_STRING_BELOW
default "2.6.31.1" if KERNEL_V_2_6_31_1
default "2.6.31" if KERNEL_V_2_6_31
default "3.6.30.8" if KERNEL_V_3_6_30_8
default "3.6.30.7" if KERNEL_V_3_6_30_7
default "2.6.30.8" if KERNEL_V_2_6_30_8
default "2.6.30.7" if KERNEL_V_2_6_30_7
default "2.6.30.6" if KERNEL_V_2_6_30_6
default "2.6.30.5" if KERNEL_V_2_6_30_5
default "2.6.30.4" if KERNEL_V_2_6_30_4

17
configure vendored

@ -121,6 +121,7 @@ check_for() {
eval val="\${${var}}"
if [ -n "${val}" ]; then
printf "${val} (cached)\n"
add_to_var_list "${var}"
return 0
fi
fi
@ -129,7 +130,10 @@ check_for() {
printf "no\n"
continue
elif [ -n "${ver}" ]; then
str=$( "${where}" --version 2>&1 |grep -E "${ver}" |head -n 1 )
str=$( LC_ALL=C "${where}" --version 2>&1 \
|grep -E "${ver}" \
|head -n 1
)
if [ -z "${str}" ]; then
printf "no\n"
unset where
@ -400,10 +404,17 @@ echo "${VERSION}"
# Now we have the version string, we can build up the paths
[ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib/ct-ng-${VERSION}"
[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc/ct-ng-${VERSION}"
[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib"
[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc"
[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
# Install support files in our own sub-dir, so as not to mangle (system)
# files and dirs, but only if not --local
if [ -z "${LOCAL_set}" ]; then
LIBDIR="${LIBDIR}/ct-ng-${VERSION}"
DOCDIR="${DOCDIR}/ct-ng-${VERSION}"
fi
# Check that install PATHs are absolute
for p in BIN LIB DOC MAN; do
var="${p}DIR"

9
ct-ng.in

@ -32,6 +32,10 @@ include $(CT_LIB_DIR)/paths.mk
# bash.
export SHELL=$(bash)
# GREP_OPTIONS=--color=always will break the generated .in files
# We do not need any GREP_OPTIONS anyway, so set it to empty.
export GREP_OPTIONS=
# Make the restart/stop steps availabe to scripts/crostool-NG.sh
export CT_STOP:=$(STOP)
export CT_RESTART:=$(RESTART)
@ -56,10 +60,11 @@ ifeq ($(strip $(origin V)),command line)
endif # origin V
export V SILENT ECHO
.FORCE: $(FORCE)
all: help
.PHONY: $(PHONY)
PHONY += all
all: help
FORCE:
# Help system
help:: help-head help-config help-samples help-build help-clean help-distrib help-env help-tail

10
docs/overview.txt

@ -331,22 +331,22 @@ Stopping and restarting a build |
If you want to stop the build after a step you are debugging, you can pass the
variable STOP to make:
ct-ng STOP=some_step
ct-ng build STOP=some_step
Conversely, if you want to restart a build at a specific step you are
debugging, you can pass the RESTART variable to make:
ct-ng RESTART=some_step
ct-ng build RESTART=some_step
Alternatively, you can call make with the name of a step to just do that step:
ct-ng libc_headers
is equivalent to:
ct-ng RESTART=libc_headers STOP=libc_headers
ct-ng build RESTART=libc_headers STOP=libc_headers
The shortcuts +step_name and step_name+ allow to respectively stop or restart
at that step. Thus:
ct-ng +libc_headers and: ct-ng libc_headers+
ct-ng +libc_headers and: ct-ng libc_headers+
are equivalent to:
ct-ng STOP=libc_headers and: ct-ng RESTART=libc_headers
ct-ng build STOP=libc_headers and: ct-ng build RESTART=libc_headers
To obtain the list of acceptable steps, please call:
ct-ng list-steps

30
patches/uClibc/0.9.30.1/180-getline-conflict.patch

@ -0,0 +1,30 @@
--- a/extra/scripts/unifdef.c
+++ b/extra/scripts/unifdef.c
@@ -206,7 +206,7 @@
static void error(const char *);
static int findsym(const char *);
static void flushline(bool);
-static Linetype getline(void);
+static Linetype get_line(void);
static Linetype ifeval(const char **);
static void ignoreoff(void);
static void ignoreon(void);
@@ -512,7 +512,7 @@
for (;;) {
linenum++;
- lineval = getline();
+ lineval = get_line();
trans_table[ifstate[depth]][lineval]();
debug("process %s -> %s depth %d",
linetype_name[lineval],
@@ -526,7 +526,7 @@
* help from skipcomment().
*/
static Linetype
-getline(void)
+get_line(void)
{
const char *cp;
int cursym;

12
patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch

@ -0,0 +1,12 @@
diff -Narup uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c uClibc-0.9.30.1/libc/inet/getaddrinfo.c
--- uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c 2009-02-26 21:49:14.000000000 +0900
+++ uClibc-0.9.30.1/libc/inet/getaddrinfo.c 2009-03-06 00:59:23.000000000 +0900
@@ -187,6 +187,8 @@ static unsigned __check_pf(void)
}
for (runp = ifa; runp != NULL; runp = runp->ifa_next) {
+ if (runp->ifa_addr == NULL)
+ continue;
#if defined __UCLIBC_HAS_IPV4__
if (runp->ifa_addr->sa_family == PF_INET)
seen |= SEEN_IPV4;

224
patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch

@ -0,0 +1,224 @@
diff -urN uClibc-0.9.30.1.orig/include/netinet/igmp.h uClibc-0.9.30.1/include/netinet/igmp.h
--- uClibc-0.9.30.1.orig/include/netinet/igmp.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/igmp.h 2009-04-08 09:00:26.242514273 +0200
@@ -69,7 +69,7 @@
u_int8_t igmp_code; /* routing code */
u_int16_t igmp_cksum; /* checksum */
struct in_addr igmp_group; /* group address */
-};
+} __attribute__ ((__packed__));
#define IGMP_MINLEN 8
diff -urN uClibc-0.9.30.1.orig/include/netinet/in.h uClibc-0.9.30.1/include/netinet/in.h
--- uClibc-0.9.30.1.orig/include/netinet/in.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/in.h 2009-04-08 09:00:26.242514273 +0200
@@ -202,7 +202,7 @@
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
#define s6_addr32 in6_u.u6_addr32
- };
+ } __attribute__ ((__packed__));
extern const struct in6_addr in6addr_any; /* :: */
extern const struct in6_addr in6addr_loopback; /* ::1 */
@@ -229,7 +229,7 @@
__SOCKADDR_COMMON_SIZE -
sizeof (in_port_t) -
sizeof (struct in_addr)];
- };
+ } __attribute__ ((__packed__));
#endif
/* Ditto, for IPv6. */
@@ -240,7 +240,7 @@
uint32_t sin6_flowinfo; /* IPv6 flow information */
struct in6_addr sin6_addr; /* IPv6 address */
uint32_t sin6_scope_id; /* IPv6 scope-id */
- };
+ } __attribute__ ((__packed__));
/* IPv4 multicast request. */
@@ -251,7 +251,7 @@
/* Local IP address of interface. */
struct in_addr imr_interface;
- };
+ } __attribute__ ((__packed__));
struct ip_mreq_source
{
@@ -263,7 +263,7 @@
/* IP address of interface. */
struct in_addr imr_sourceaddr;
- };
+ } __attribute__ ((__packed__));
/* Likewise, for IPv6. */
struct ipv6_mreq
@@ -273,7 +273,7 @@
/* local interface */
unsigned int ipv6mr_interface;
- };
+ } __attribute__ ((__packed__));
/* Multicast group request. */
@@ -284,7 +284,7 @@
/* Group address. */
struct sockaddr_storage gr_group;
- };
+ } __attribute__ ((__packed__));
struct group_source_req
{
@@ -296,7 +296,7 @@
/* Source address. */
struct sockaddr_storage gsr_source;
- };
+ } __attribute__ ((__packed__));
/* Full-state filter operations. */
@@ -315,7 +315,7 @@
uint32_t imsf_numsrc;
/* Source addresses. */
struct in_addr imsf_slist[1];
- };
+ } __attribute__ ((__packed__));
#define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \
- sizeof (struct in_addr) \
@@ -336,7 +336,7 @@
uint32_t gf_numsrc;
/* Source addresses. */
struct sockaddr_storage gf_slist[1];
-};
+} __attribute__ ((__packed__));
#define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \
- sizeof (struct sockaddr_storage) \
@@ -460,14 +460,14 @@
{
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
unsigned int ipi6_ifindex; /* send/recv interface index */
- };
+ } __attribute__ ((__packed__));
/* IPv6 MTU information. */
struct ip6_mtuinfo
{
struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
uint32_t ip6m_mtu; /* path MTU in host byte order */
- };
+ } __attribute__ ((__packed__));
#if 0 /*def __USE_GNU*/
diff -urN uClibc-0.9.30.1.orig/include/netinet/ip.h uClibc-0.9.30.1/include/netinet/ip.h
--- uClibc-0.9.30.1.orig/include/netinet/ip.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/ip.h 2009-04-08 09:00:26.242514273 +0200
@@ -63,7 +63,7 @@
u_int32_t saddr;
u_int32_t daddr;
/*The options start here. */
- };
+ } __attribute__ ((__packed__));
#ifdef __USE_BSD
/*
@@ -127,7 +127,7 @@
u_int8_t ip_p; /* protocol */
u_short ip_sum; /* checksum */
struct in_addr ip_src, ip_dst; /* source and dest address */
- };
+ } __attribute__ ((__packed__));
/*
* Time stamp option structure.
diff -urN uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h uClibc-0.9.30.1/include/netinet/ip_icmp.h
--- uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/ip_icmp.h 2009-04-08 09:00:26.242514273 +0200
@@ -43,7 +43,7 @@
u_int16_t mtu;
} frag; /* path mtu discovery */
} un;
-};
+} __attribute__ ((__packed__));
#define ICMP_ECHOREPLY 0 /* Echo Reply */
#define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
@@ -199,7 +199,7 @@
#define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
-};
+} __attribute__ ((__packed__));
/*
* Lower bounds on packet lengths for various types.
diff -urN uClibc-0.9.30.1.orig/include/netinet/tcp.h uClibc-0.9.30.1/include/netinet/tcp.h
--- uClibc-0.9.30.1.orig/include/netinet/tcp.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/tcp.h 2009-04-08 09:00:26.242514273 +0200
@@ -86,7 +86,7 @@
u_int16_t th_win; /* window */
u_int16_t th_sum; /* checksum */
u_int16_t th_urp; /* urgent pointer */
-};
+} __attribute__ ((__packed__));
# else /* !__FAVOR_BSD */
struct tcphdr
@@ -121,7 +121,7 @@
u_int16_t window;
u_int16_t check;
u_int16_t urg_ptr;
-};
+} __attribute__ ((__packed__));
# endif /* __FAVOR_BSD */
enum
@@ -226,7 +226,7 @@
u_int32_t tcpi_rcv_space;
u_int32_t tcpi_total_retrans;
-};
+} __attribute__ ((__packed__));
/* For TCP_MD5SIG socket option. */
@@ -239,7 +239,7 @@
u_int16_t tcpm_keylen; /* Key length. */
u_int32_t __tcpm_pad2; /* Zero. */
u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
-};
+} __attribute__ ((__packed__));
#endif /* Misc. */
diff -urN uClibc-0.9.30.1.orig/include/netinet/udp.h uClibc-0.9.30.1/include/netinet/udp.h
--- uClibc-0.9.30.1.orig/include/netinet/udp.h 2009-04-08 09:00:10.926545132 +0200
+++ uClibc-0.9.30.1/include/netinet/udp.h 2009-04-08 09:00:26.242514273 +0200
@@ -61,7 +61,7 @@
u_int16_t uh_dport; /* destination port */
u_int16_t uh_ulen; /* udp length */
u_int16_t uh_sum; /* udp checksum */
-};
+} __attribute__ ((__packed__));
#else
@@ -71,7 +71,7 @@
u_int16_t dest;
u_int16_t len;
u_int16_t check;
-};
+} __attribute__ ((__packed__));
#endif
#define SOL_UDP 17 /* sockopt level for UDP */

23
samples/avr32-unknown-none/crosstool.config

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG version: hg_default@1562_fdf936326ccd
# Sun Oct 4 12:47:01 2009
# crosstool-NG version: hg_default@1563_8d386988dcb1
# Thu Oct 8 23:23:29 2009
#
#
@ -13,16 +13,13 @@
#
# CT_OBSOLETE is not set
CT_EXPERIMENTAL=y
CT_DEBUG_CT=y
# CT_DEBUG_PAUSE_STEPS is not set
CT_DEBUG_CT_SAVE_STEPS=y
# CT_DEBUG_CT_SAVE_STEPS_GZIP is not set
# CT_NO_OVERIDE_LC_MESSAGES is not set
# CT_DEBUG_CT is not set
#
# Paths
#
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_WORK_DIR="${CT_TOP_DIR}/targets"
CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
CT_INSTALL_DIR="${CT_PREFIX_DIR}"
@ -61,22 +58,22 @@ CT_PARALLEL_JOBS=1
CT_LOAD=0
CT_NICE=0
CT_USE_PIPES=y
# CT_CONFIG_SHELL_SH is not set
CT_CONFIG_SHELL_SH=y
# CT_CONFIG_SHELL_ASH is not set
CT_CONFIG_SHELL_BASH=y
# CT_CONFIG_SHELL_BASH is not set
# CT_CONFIG_SHELL_CUSTOM is not set
CT_CONFIG_SHELL="bash"
CT_CONFIG_SHELL="sh"
#
# Logging
#
# CT_LOG_ERROR is not set
# CT_LOG_WARN is not set
CT_LOG_INFO=y
# CT_LOG_EXTRA is not set
# CT_LOG_INFO is not set
CT_LOG_EXTRA=y
# CT_LOG_DEBUG is not set
# CT_LOG_ALL is not set
CT_LOG_LEVEL_MAX="INFO"
CT_LOG_LEVEL_MAX="EXTRA"
# CT_LOG_SEE_TOOLS_WARN is not set
CT_LOG_PROGRESS_BAR=y
CT_LOG_TO_FILE=y

2
samples/samples.mk

@ -38,7 +38,7 @@ $(patsubst %,show-%,$(CT_SAMPLES)):
# print the list of all available samples
PHONY += list-samples
list-samples: .FORCE
list-samples: FORCE
@echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' |sort
wiki-samples:

2
scripts/build/debug/300-gdb.sh

@ -47,7 +47,7 @@ do_debug_gdb_get() {
fi
if [ "${do_ncurses}" = "y" ]; then
CT_GetFile "ncurses-${CT_NCURSES_VERSION}" \
CT_GetFile "ncurses-${CT_NCURSES_VERSION}" .tar.gz \
{ftp,http}://ftp.gnu.org/pub/gnu/ncurses \
ftp://invisible-island.net/ncurses
fi

8
scripts/build/libc/newlib.sh

@ -46,6 +46,11 @@ do_libc() {
CT_DoLog EXTRA "Configuring C library"
# Note: newlib handles the build/host/target a little bit differently
# than one would expect:
# build : not used
# host : the machine building newlib
# target : the machine newlib runs on
# CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
BUILD_CC="${CT_BUILD}-gcc" \
CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \
@ -53,8 +58,7 @@ do_libc() {
RANLIB=${CT_TARGET}-ranlib \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
--host=${CT_BUILD} \
--target=${CT_TARGET} \
--prefix=${CT_PREFIX_DIR} \
${extra_config} \

12
scripts/build/libc/uClibc.sh

@ -198,17 +198,19 @@ s/.*(DOSTRIP).*/# \\1 is not set/
ENDSED
# Ah. We may one day need architecture-specific handler here...
# Hack the ARM {E,O}ABI into the config file
if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
cat >>"${munge_file}" <<-ENDSED
if [ "${CT_ARCH}" = "arm" ]; then
# Hack the ARM {E,O}ABI into the config file
if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
cat >>"${munge_file}" <<-ENDSED
s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/
s/.*(CONFIG_ARM_EABI).*/\\1=y/
ENDSED
else
cat >>"${munge_file}" <<-ENDSED
else
cat >>"${munge_file}" <<-ENDSED
s/.*(CONFIG_ARM_OABI).*/\\1=y/
s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/
ENDSED
fi
fi
# Accomodate for old and new uClibc versions, where the

3
scripts/crosstool-NG.sh.in

@ -134,6 +134,9 @@ CT_DoBuildTargetTuple
# then rescan the options file now:
. .config
# Sanity check some directories
CT_TestAndAbort "'CT_PREFIX_DIR' is not set: where should I install?" -z "${CT_PREFIX_DIR}"
# Second kludge: merge user-supplied target CFLAGS with architecture-provided
# target CFLAGS. Do the same for LDFLAGS in case it happens in the future.
# Put user-supplied flags at the end, so that they take precedence.

2
scripts/functions

@ -612,7 +612,7 @@ CT_Patch() {
CT_DoLog EXTRA "Patching '${basename}'"
bundled_patch_dir="${CT_LIB_DIR}/patches/${base_file}/${ver_file}"
local_patch_dir="${CT_CUSTOM_PATCH_DIR}/${base_file}/${ver_file}"
local_patch_dir="${CT_LOCAL_PATCH_DIR}/${base_file}/${ver_file}"
case "${CT_PATCH_ORDER}" in
bundled) patch_dirs=("${bundled_patch_dir}");;

6
scripts/scripts.mk

@ -35,14 +35,12 @@ PHONY += scripts
scripts:
$(SILENT)mkdir -p scripts
FROCE += $(CONFIG_SUB_DEST)
$(CONFIG_SUB_DEST): scripts
$(CONFIG_SUB_DEST): scripts FORCE
@$(ECHO) ' WGET $@'
$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_SUB_SRC)
$(SILENT)chmod u+rwx,go+rx-w $@
FORCE += $(CONFIG_GUESS_DEST)
$(CONFIG_GUESS_DEST): scripts
$(CONFIG_GUESS_DEST): scripts FORCE
@$(ECHO) ' WGET $@'
$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_GUESS_SRC)
$(SILENT)chmod u+rwx,go+rx-w $@

Loading…
Cancel
Save