diff options
| -rw-r--r-- | make/uclibc.mk | 18 | ||||
| -rw-r--r-- | sources/uClibc.config | 9 |
2 files changed, 16 insertions, 11 deletions
diff --git a/make/uclibc.mk b/make/uclibc.mk index ad41b4907..310a5ec98 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -33,7 +33,9 @@ else endif perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \ $(UCLIBC_DIR)/.config - perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \ + perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"$(STAGING_DIR)\",g' \ + $(UCLIBC_DIR)/.config + perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)/usr\",g' \ $(UCLIBC_DIR)/.config perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \ $(UCLIBC_DIR)/.config @@ -61,7 +63,9 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a ifneq ($(TARGET_DIR),) $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a - $(MAKE) -C $(UCLIBC_DIR) DEVEL_PREFIX=$(TARGET_DIR) \ + $(MAKE) -C $(UCLIBC_DIR) \ + RUNTIME_PREFIX=$(TARGET_DIR) \ + DEVEL_PREFIX=$(TARGET_DIR)/usr \ SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_runtime @@ -94,11 +98,11 @@ uclibc-dirclean: ############################################################# $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a - $(MAKE) DEVEL_PREFIX=$(TARGET_DIR)/usr SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ - DEVEL_TOOL_PREFIX=$(TARGET_DIR) -C $(UCLIBC_DIR) \ - install_dev - #remove the extra copy of the shared libs - rm -f $(TARGET_DIR)/usr/lib/*-*.so + $(MAKE) -C $(UCLIBC_DIR) \ + RUNTIME_PREFIX=$(TARGET_DIR) \ + DEVEL_PREFIX=$(TARGET_DIR)/usr \ + SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ + DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_dev (cd $(TARGET_DIR)/usr/lib; \ ln -fs /lib/libc.so.0 libc.so; \ ln -fs /lib/libdl.so.0 libdl.so; \ diff --git a/sources/uClibc.config b/sources/uClibc.config index 67b6d0ccb..06cc52e30 100644 --- a/sources/uClibc.config +++ b/sources/uClibc.config @@ -60,7 +60,7 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" # # UCLIBC_HAS_IPV6 is not set UCLIBC_HAS_RPC=y -# UCLIBC_HAS_FULL_RPC is not set +UCLIBC_HAS_FULL_RPC=y # # String and Stdio Support @@ -94,9 +94,9 @@ UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y UCLIBC_HAS_PRINTF_M_SPEC=y UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SYS_ERRLIST=y UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_SYS_SIGLIST=y UCLIBC_HAS_GNU_GETOPT=y # @@ -111,6 +111,7 @@ UCLIBC_HAS_GLOB=y # Library Installation Options # SHARED_LIB_LOADER_PATH="/lib" +RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" @@ -118,7 +119,7 @@ DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" # # uClibc development/debugging options # -# DODEBUG is not set +DODEBUG=y # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set |