diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-31 11:11:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-31 11:11:18 +0100 |
| commit | cae7454e8151e56da5f0b9f14a06fbcefe153a72 (patch) | |
| tree | 5d97f0f7bf2ab079f3aac17015838f9b7665c0a1 /package/glibc | |
| parent | 657effffde51e2cf9181d71524a6eef1b968e9f7 (diff) | |
rework libc-dev package, add linker script for x86
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Makefile | 7 | ||||
| -rw-r--r-- | package/glibc/files/libc.so.x86 | 5 | ||||
| -rw-r--r-- | package/glibc/files/libc.so.x86_64 | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 103452469..27f5baafc 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -47,8 +47,11 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} done glibc-dev-install: - ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib - cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1 + ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib + # install linker script + -cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ diff --git a/package/glibc/files/libc.so.x86 b/package/glibc/files/libc.so.x86 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/glibc/files/libc.so.x86 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/glibc/files/libc.so.x86_64 b/package/glibc/files/libc.so.x86_64 new file mode 100644 index 000000000..a2e2de87f --- /dev/null +++ b/package/glibc/files/libc.so.x86_64 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-x86-64) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) ) |