summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/eglibc/Makefile1
-rw-r--r--package/gcc/Makefile17
-rw-r--r--package/openssl/Config.in9
3 files changed, 23 insertions, 4 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 3333f85dc..e80995a84 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -62,6 +62,7 @@ endif
cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
+ cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.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/gcc/Makefile b/package/gcc/Makefile
index 6c28e0f4c..cbd9ee0db 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -20,7 +20,7 @@ ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y)
CONFIGURE_ARGS+= --with-abi=64
endif
CONFIGURE_ENV+= ac_cv_func_fputc_unlocked=no
-CONFIGURE_ARGS+= --enable-languages=c \
+CONFIGURE_ARGS+= --enable-languages=c,c++ \
--libexecdir=/usr/lib \
--host=$(REAL_GNU_TARGET_NAME) \
--target=$(REAL_GNU_TARGET_NAME) \
@@ -29,18 +29,27 @@ CONFIGURE_ARGS+= --enable-languages=c \
--with-gnu-ld \
--disable-libssp \
--disable-nls \
+ --disable-sjlj-exceptions \
+ --disable-biarch \
--disable-libmudflap \
--disable-libgomp \
- --disable-multilib
+ --disable-multilib \
+ --disable-libstdcxx-pch
BUILD_STYLE:= auto
-ALL_TARGET:= all-gcc all-target-libgcc
+#ALL_TARGET:= all-gcc all-target-libgcc
INSTALL_STYLE:= auto
-INSTALL_TARGET:= install-gcc install-target-libgcc
+#INSTALL_TARGET:= install-gcc install-target-libgcc
post-install:
${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
+ ${INSTALL_DIR} ${IDIR_GCC}/lib ${IDIR_GCC}/usr/include/c++
${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
+ cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
+ ${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/
+ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
+ cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp .
${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 9774ea7f6..355603a4f 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -19,6 +19,15 @@ config ADK_PACKAGE_LIBOPENSSL
This package contains the shared SSL libraries, needed by other programs.
+config ADK_PACKAGE_LIBOPENSSL_DEV
+ prompt "libopenssl-dev.................... SSL development files"
+ tristate
+ default n
+ select ADK_COMPILE_OPENSSL
+ depends on ADK_PACKAGE_LIBOPENSSL
+ help
+ http://www.openssl.org/
+
config ADK_PACKAGE_OPENSSL_UTIL
prompt "openssl-util.................... OpenSSL command line tool"
tristate