summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-02-02 22:04:15 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-02-02 22:04:15 +0100
commitd447483f8e4300fb954faf26675e8984231facdd (patch)
tree66ad8630ace742235d06e81591ca0d3024e79998
parentb2ae8e3c7ba672368406ece861ae05a9051f4593 (diff)
parentdb900a4ddbe5791bce1dcbe6687ccbd2e0d13c4d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/eglibc/Makefile8
-rw-r--r--target/linux/config/Config.in.netdevice3
-rw-r--r--target/mips/uclibc.config2
-rw-r--r--toolchain/gcc/Makefile2
4 files changed, 9 insertions, 6 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 4f72f2400..ddd86201b 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -84,11 +84,9 @@ eglibc-dev-install:
-cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
- cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so
- cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so
- cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so
- cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
- cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
+ -for file in libc libcrypt libdl libm libresolv librt libutil; do \
+ cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
+ done
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index e730ce99a..6c30397a4 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -351,6 +351,7 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
prompt "kmod-rt2400pci............... Ralink rt2400"
tristate
select ADK_KERNEL_RT2X00
+ select ADK_KPACKAGE_KMOD_MAC80211
select ADK_KERNEL_MAC80211_LEDS
depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
default n
@@ -362,6 +363,7 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
prompt "kmod-rt2500pci............... Ralink rt2500"
tristate
select ADK_KERNEL_RT2X00
+ select ADK_KPACKAGE_KMOD_MAC80211
select ADK_KERNEL_MAC80211_LEDS
depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
default n
@@ -373,6 +375,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
prompt "kmod-rt61pci................. Ralink rt2501/rt61"
tristate
select ADK_KERNEL_RT2X00
+ select ADK_KPACKAGE_KMOD_MAC80211
select ADK_KERNEL_MAC80211_LEDS
select ADK_KPACKAGE_KMOD_CRC_ITU_T
select ADK_PACKAGE_RT61_FIRMWARE
diff --git a/target/mips/uclibc.config b/target/mips/uclibc.config
index 2b4b5e50d..95fa5f687 100644
--- a/target/mips/uclibc.config
+++ b/target/mips/uclibc.config
@@ -88,7 +88,7 @@ UCLIBC_CTOR_DTOR=y
UCLIBC_HAS_THREADS_NATIVE=y
UCLIBC_HAS_THREADS=y
UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 190cdf689..6e5fd7b49 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -160,6 +160,8 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured
$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install
+ # workaround if you cross-compile binutils
+ @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
# Set up the symlinks to enable lying about target name.
set -e; \
(cd $(STAGING_HOST_DIR); \