fix the annoying bug, where c++ apps fail to link for mips n32 or x86_64 systems

17 files changed, 9 insertions, 24 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 14eef4e6e..3c58d34a0 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
 			--without-tools \
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 694c6b0b1..446f465ab 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -26,9 +26,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915
 endif
@@ -36,7 +33,6 @@ endif
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-gallium-llvm \
 			--with-gallium-drivers=swrast \
-			--with-driver=dri \
 			--disable-gles1 \
 			--disable-gles2 \
 			--with-dri-drivers=${DRI_DRIVERS},swrast
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 4a6182384..934788dcb 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -19,7 +19,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=        -L$(STAGING_DIR)/usr/lib64
 CONFIGURE_ARGS+=	--without-cplusplus \
 			--without-python \
 			--without-java
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 2e72e0073..c514ea502 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -104,7 +104,6 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-safe-browsing \
 			--disable-elf-hack 
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 912912b2b..9f2c1bae9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= 	--enable-cryptodev
 endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=	-pthread -L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--disable-rpath \
 			--without-libz-prefix \
 			--without-p11-kit
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index 452b8eafa..d2530b5a1 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -22,8 +22,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
-
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index c6bb859ee..f82056835 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -19,8 +19,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
-
 libsigc++-install:
 	${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libsigc-2.0.so* ${IDIR_LIBSIGCXX}/usr/lib/
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 274e6ba25..bbcada2f6 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-aligned
-TARGET_LDFLAGS+=        -L$(STAGING_DIR)/usr/lib64
 
 libtorrent-install:
 	${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/log4cplus/Makefile b/package/log4cplus/Makefile
index 8f557c600..4fd0fbe13 100644
--- a/package/log4cplus/Makefile
+++ b/package/log4cplus/Makefile
@@ -19,8 +19,6 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-TARGET_LDFLAGS+=        -L$(STAGING_DIR)/usr/lib64
-
 $(eval $(call PKG_template,LOG4CPLUS,log4cplus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 log4cplus-install:
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index 14c5d5473..d34d8a2f0 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -24,8 +24,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
-
 log4cxx-install:
 	${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
diff --git a/package/pango/Makefile b/package/pango/Makefile
index b3979b9e2..a5e2aca9f 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
 
 pango-install:
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 1d3cd131f..12738c2cb 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -28,7 +28,6 @@ $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION}))
 
 XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 
 libpcre-install:
 	${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
index fe61ae358..1e15a4340 100644
--- a/package/poppler/Makefile
+++ b/package/poppler/Makefile
@@ -19,8 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
-
 poppler-install:
 	$(INSTALL_DIR) $(IDIR_POPPLER)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libpoppler*.so* \
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 12a9fb938..74c7d2257 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -67,8 +67,6 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
-
 define PKG_mod_template
 
 INSTALL_MODS_$${ADK_PACKAGE_${1}}+=	${2}-install
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 27d98e0fa..6c73f3fb9 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -23,7 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,VLC,vlc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CFLAGS+=		-fPIC
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
 CONFIGURE_ENV+=		ac_cv_func_sched_getaffinity=no
 CONFIGURE_ARGS+=	--disable-lua \
 			--disable-dbus \
diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong
index 30cf1dd6d..6700b49e8 100644
--- a/target/mips/sys-available/lemote-yeelong
+++ b/target/mips/sys-available/lemote-yeelong
@@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_PCI
 	help
          System profile for Lemote Yeelong laptop.
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 775f871c1..f82332702 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -195,6 +195,13 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		done;
 	# workaround for openjdk
 	cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin ; cp * ..
+	# fix linking g++ apps with libtool
+	@-test -d $(STAGING_TARGET_DIR)/lib32 && \
+		cd $(STAGING_TARGET_DIR)/lib32 && \
+		ln -sf libstdc++.so.6.0.17 libstdc++.so
+	@-test -d $(STAGING_TARGET_DIR)/lib64 && \
+		cd $(STAGING_TARGET_DIR)/lib64 && \
+		ln -sf libstdc++.so.6.0.17 libstdc++.so
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk