Add ldd and ldconfig support, template packages derived from gcc and uclibc

SVN-Revision: 6856
This commit is contained in:
Florian Fainelli 2007-04-03 22:50:27 +00:00
parent 743de3f04f
commit da8174507a
3 changed files with 45 additions and 17 deletions

View file

@ -24,6 +24,7 @@ include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1) ifneq ($(DUMP),1)
TARGET:=-$(BOARD)-$(KERNEL) TARGET:=-$(BOARD)-$(KERNEL)
UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
UCLIBC_EXTRA_VERSION:=${shell cat $(STAGING_DIR)/uclibc_extra_version 2>/dev/null}
LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
else else
UCLIBC_VERSION:=<UCLIBC_VERSION> UCLIBC_VERSION:=<UCLIBC_VERSION>
@ -60,41 +61,50 @@ define Package/base-files$(TARGET)/conffiles
$(call $(TARGET)/conffiles) $(call $(TARGET)/conffiles)
endef endef
define Package/libgcc define Package/gcc/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=@!NATIVE_TOOLCHAIN DEPENDS:=@!NATIVE_TOOLCHAIN
TITLE:=GCC support library
URL:=http://gcc.gnu.org/ URL:=http://gcc.gnu.org/
VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
endef endef
define Package/libgcc
$(call Package/gcc/Default)
TITLE:=GCC support library
endef
define Package/libssp define Package/libssp
$(call Package/gcc/Default)
TITLE:=GCC support library
endef
define Package/uclibc/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=@!NATIVE_TOOLCHAIN DEPENDS:=@!NATIVE_TOOLCHAIN
DEFAULT:=m URL:=http://uclibc.org/
TITLE:=GCC support library VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
URL:=http://gcc.gnu.org/
VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
endef endef
define Package/libpthread define Package/libpthread
SECTION:=libs $(call Package/uclibc/Default)
CATEGORY:=Libraries
DEPENDS:=@!NATIVE_TOOLCHAIN
TITLE:=POSIX thread library TITLE:=POSIX thread library
URL:=http://uclibc.org/
VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
endef endef
define Package/uclibc define Package/uclibc
SECTION:=libs $(call Package/uclibc/Default)
CATEGORY:=Base system
DEPENDS:=@!NATIVE_TOOLCHAIN
TITLE:=C library embedded systems TITLE:=C library embedded systems
URL:=http://uclibc.org/ endef
VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
define Package/ldd
$(call Package/uclibc/Default)
TITLE:=LDD trace utility
endef
define Package/ldconfig
$(call Package/uclibc/Default)
TITLE:=Shared library path configuration
endef endef
define Build/Prepare define Build/Prepare
@ -171,6 +181,16 @@ define Package/uclibc/install
done done
endef endef
define Package/ldd/install
$(INSTALL_DIR) $(1)/bin/
$(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldd $(1)/bin/
endef
define Package/ldconfig/install
$(INSTALL_DIR) $(1)/bin/
$(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldconfig $(1)/bin/
endef
ifneq ($(DUMP),1) ifneq ($(DUMP),1)
-include $(PLATFORM_DIR)/base-files.mk -include $(PLATFORM_DIR)/base-files.mk
endif endif
@ -180,4 +200,6 @@ $(eval $(call BuildPackage,libgcc))
$(eval $(call BuildPackage,libssp)) $(eval $(call BuildPackage,libssp))
$(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,libpthread))
$(eval $(call BuildPackage,uclibc)) $(eval $(call BuildPackage,uclibc))
$(eval $(call BuildPackage,ldd))
$(eval $(call BuildPackage,ldconfig))

View file

@ -10,5 +10,5 @@ alias more=less
[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
arp() { cat /proc/net/arp; } arp() { cat /proc/net/arp; }
ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } [ -z /bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
reboot() { ifdown wan 2>&1 >/dev/null ; /sbin/reboot; } reboot() { ifdown wan 2>&1 >/dev/null ; /sbin/reboot; }

View file

@ -93,6 +93,12 @@ define Build/Install
RUNTIME_PREFIX=/ \ RUNTIME_PREFIX=/ \
install_dev install_dev
echo $(PKG_VERSION) > $(STAGING_DIR)/uclibc_version echo $(PKG_VERSION) > $(STAGING_DIR)/uclibc_version
echo $(PKG_VERSION)$(PKG_EXTRAVERSION) > $(STAGING_DIR)/uclibc_extra_version
$(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX=$(STAGING_DIR)/ \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \
utils
endef endef
define Build/Clean define Build/Clean