diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
| commit | 2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch) | |
| tree | 1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/libstdcxx | |
| parent | 45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff) | |
| parent | 667bc9e981847a1d117a2fc7110948075a268bdd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libstdcxx')
| -rw-r--r-- | package/libstdcxx/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index b4e5c3b86..45c1edfc4 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -16,16 +16,20 @@ endif endif endif -PKG_NAME:= libstdcxx -PKG_DESCR:= C++ support library -PKG_SECTION:= libs -PKG_NEED_CXX:= 1 ifeq ($(ADK_LINUX_AVR32),y) -PKG_SUBVER:= 13 +LIBSTDCXX_VER:= 13 +else +ifeq ($(ADK_LINUX_MICROBLAZE),y) +LIBSTDCXX_VER:= 18 else -PKG_SUBVER:= 17 +LIBSTDCXX_VER:= 17 +endif endif +PKG_NAME:= libstdcxx +PKG_DESCR:= C++ support library +PKG_SECTION:= libs +PKG_NEED_CXX:= 1 NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk @@ -41,10 +45,10 @@ do-install: ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so.6) - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so) - (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so) - $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.${PKG_SUBVER} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} + (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so.6) + (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) + (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) + $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.${LIBSTDCXX_VER} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py endif |