summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-09-29 20:13:11 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-09-29 20:13:11 +0200
commit71c91ce903a90de852b5d66a27a673ff6e785cee (patch)
treef83f6c03989c2c1e091a692d8f7129db6144594b
parentf53612bc7414c0d9e4700f957d6a1a1742574c67 (diff)
fix some eglibc adk buildsystem problems
-rw-r--r--mk/package.mk2
-rw-r--r--package/Depends.mk4
-rw-r--r--package/bzip2/Makefile1
-rw-r--r--package/eglibc/Makefile12
-rw-r--r--package/eglibc/files/libc.so.x86_645
-rw-r--r--package/gcc/Makefile1
-rw-r--r--package/libpthread/Makefile6
-rw-r--r--package/microperl/files/uconfig.h.x86_644
-rw-r--r--package/ncurses/Makefile2
-rw-r--r--toolchain/gcc/patches/no-lib64.patch2
10 files changed, 27 insertions, 12 deletions
diff --git a/mk/package.mk b/mk/package.mk
index c28f22a7c..a9339b811 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -196,7 +196,7 @@ endif
'ramdisk location:' >&2; \
echo "$$$$x" | sed 's/^/- /' >&2; \
fi; \
- if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
+ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi; \
diff --git a/package/Depends.mk b/package/Depends.mk
index 02cf03427..0be553ba7 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -52,7 +52,7 @@ git-compile: openssl-compile curl-compile expat-compile
gkrellmd-compile: glib-compile
glib-compile: gettext-compile libiconv-compile
gmediaserver-compile: id3lib-compile libupnp-compile
-gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile
+gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ncurses-compile
ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
gpsd-compile: uclibc++-compile
endif
@@ -105,7 +105,7 @@ libtirpc-compile: libgssglue-compile
endif
libtorrent-compile: openssl-compile libsigc++-compile
libvorbis-compile: libogg-compile
-libvirt-compile: libxml2-compile gnutls-compile
+libvirt-compile: libxml2-compile gnutls-compile python-compile
libfontenc-compile: xproto-compile zlib-compile
libICE-compile: xtrans-compile
libSM-compile: libICE-compile
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index e5c690ea7..62ac57e50 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
XAKE_FLAGS+= PREFIX=${WRKINST}/usr
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index d9c4cad1e..ea271f4b6 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -44,19 +44,23 @@ do-extract:
# do nothing, eglibc is already build in toolchain directory
do-install:
- ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc
+ ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
# install /etc/localtime from host system (FIXME)
${CP} /etc/localtime $(IDIR_EGLIBC)/etc
ifeq ($(ADK_SSP),y)
$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
endif
+ $(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
- -for file in libc ld libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
+ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \
$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \
done
- # create ld.so link for x86 linker and gcc
- cd $(IDIR_EGLIBC)/lib && ln -sf ld-$(PKG_VERSION).so ld-linux.so.2
+ # install linker script
+ -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
+ cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
+ cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
+ cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
diff --git a/package/eglibc/files/libc.so.x86_64 b/package/eglibc/files/libc.so.x86_64
new file mode 100644
index 000000000..a2e2de87f
--- /dev/null
+++ b/package/eglibc/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 ) )
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 813a8241f..6c28e0f4c 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -46,6 +46,7 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
else
${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
+ ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib
endif
rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 74b0ea865..a70697533 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -5,7 +5,11 @@ include ${TOPDIR}/rules.mk
ifeq ($(ADK_TARGET_LIB_GLIBC),y)
include ${TOPDIR}/toolchain/glibc/Makefile.inc
-else
+endif
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+include ${TOPDIR}/toolchain/eglibc/Makefile.inc
+endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
include ${TOPDIR}/toolchain/uClibc/Makefile.inc
endif
diff --git a/package/microperl/files/uconfig.h.x86_64 b/package/microperl/files/uconfig.h.x86_64
index 4ad2bc5c8..c5491c2b7 100644
--- a/package/microperl/files/uconfig.h.x86_64
+++ b/package/microperl/files/uconfig.h.x86_64
@@ -3865,13 +3865,13 @@
* This symbol, if defined, indicates that the strlcat () routine is
* available to do string concatenation.
*/
-#define HAS_STRLCAT /**/
+/*#define HAS_STRLCAT /* */
/* HAS_STRLCPY:
* This symbol, if defined, indicates that the strlcpy () routine is
* available to do string copying.
*/
-#define HAS_STRLCPY /**/
+/*#define HAS_STRLCPY /* */
/* HAS_STRTOLD:
* This symbol, if defined, indicates that the strtold routine is
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index c008f1917..db71137ce 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --without-cxx \
--enable-const \
--enable-echo
BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+INSTALL_STYLE= auto
ALL_TARGET:= libs
INSTALL_TARGET:= install.libs install.data
diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch
index 25ada0e4e..add17ecb8 100644
--- a/toolchain/gcc/patches/no-lib64.patch
+++ b/toolchain/gcc/patches/no-lib64.patch
@@ -6,7 +6,7 @@ diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/lin
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#undef ASM_SPEC
#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \