Cope with the new RUNTIME_PREFIX

This commit is contained in:
Eric Andersen 2003-10-18 11:51:50 +00:00
parent 02bf5816b5
commit 83b95bdb42
2 changed files with 16 additions and 11 deletions

View File

@ -33,7 +33,9 @@ else
endif endif
perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \ perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
$(UCLIBC_DIR)/.config $(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 $(UCLIBC_DIR)/.config
perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \ perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \
$(UCLIBC_DIR)/.config $(UCLIBC_DIR)/.config
@ -61,7 +63,9 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
ifneq ($(TARGET_DIR),) ifneq ($(TARGET_DIR),)
$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a $(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) \ SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \
DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_runtime 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 $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a
$(MAKE) DEVEL_PREFIX=$(TARGET_DIR)/usr SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ $(MAKE) -C $(UCLIBC_DIR) \
DEVEL_TOOL_PREFIX=$(TARGET_DIR) -C $(UCLIBC_DIR) \ RUNTIME_PREFIX=$(TARGET_DIR) \
install_dev DEVEL_PREFIX=$(TARGET_DIR)/usr \
#remove the extra copy of the shared libs SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \
rm -f $(TARGET_DIR)/usr/lib/*-*.so DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_dev
(cd $(TARGET_DIR)/usr/lib; \ (cd $(TARGET_DIR)/usr/lib; \
ln -fs /lib/libc.so.0 libc.so; \ ln -fs /lib/libc.so.0 libc.so; \
ln -fs /lib/libdl.so.0 libdl.so; \ ln -fs /lib/libdl.so.0 libdl.so; \

View File

@ -60,7 +60,7 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ"
# #
# UCLIBC_HAS_IPV6 is not set # UCLIBC_HAS_IPV6 is not set
UCLIBC_HAS_RPC=y UCLIBC_HAS_RPC=y
# UCLIBC_HAS_FULL_RPC is not set UCLIBC_HAS_FULL_RPC=y
# #
# String and Stdio Support # String and Stdio Support
@ -94,9 +94,9 @@ UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
UCLIBC_HAS_PRINTF_M_SPEC=y UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_ERRNO_MESSAGES=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_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set UCLIBC_HAS_SYS_SIGLIST=y
UCLIBC_HAS_GNU_GETOPT=y UCLIBC_HAS_GNU_GETOPT=y
# #
@ -111,6 +111,7 @@ UCLIBC_HAS_GLOB=y
# Library Installation Options # Library Installation Options
# #
SHARED_LIB_LOADER_PATH="/lib" SHARED_LIB_LOADER_PATH="/lib"
RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
@ -118,7 +119,7 @@ DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
# #
# uClibc development/debugging options # uClibc development/debugging options
# #
# DODEBUG is not set DODEBUG=y
# DOASSERTS is not set # DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set # SUPPORT_LD_DEBUG_EARLY is not set