diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 16:50:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 16:50:53 +0200 |
| commit | eee3718f1ec72f689f3a241af008e985819826df (patch) | |
| tree | 6c3f58ac7adb7e2ce85f53ed71a418b656a5b162 /package/libsigc++ | |
| parent | b74845e7a1608a96af70e1b3ae4c6c28e5052e7a (diff) | |
| parent | 1cd31f169fab4ab0ce45617c161da3fec9f7359d (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libsigc++')
| -rw-r--r-- | package/libsigc++/Config.in | 19 | ||||
| -rw-r--r-- | package/libsigc++/Makefile | 20 |
2 files changed, 37 insertions, 2 deletions
diff --git a/package/libsigc++/Config.in b/package/libsigc++/Config.in index 16c4da796..cf47fe9bf 100644 --- a/package/libsigc++/Config.in +++ b/package/libsigc++/Config.in @@ -2,7 +2,24 @@ config ADK_PACKAGE_LIBSIGCXX prompt "libsigc++......................... Callback framework for C++" tristate depends on ADK_CXX - select ADK_PACKAGE_LIBSTDCXX default n help Callback framework for C++ + +choice +prompt "C++ library to use" +depends on ADK_PACKAGE_LIBSIGCXX +default ADK_COMPILE_LIBSIGCXX_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC + +config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX + bool "Standard C++ library" + select ADK_PACKAGE_LIBSTDCXX + help + +config ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX + bool "Embedded uClibc++ library" + select ADK_PACKAGE_UCLIBCXX + help + +endchoice diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index 42aa50120..266f82f9c 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -11,18 +11,36 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e27a20ac9bc9100f48effdfca8e8c595 PKG_DESCR:= Callback framework for C++ PKG_SECTION:= libs -PKG_DEPENDS:= libstdc++ PKG_URL:= http://libsigc.sourceforge.net PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} include ${TOPDIR}/mk/package.mk +ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) +PKG_DEPENDS:= uclibc++ +else +PKG_DEPENDS:= libstdcxx +endif + $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) +CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ + -I${STAGING_DIR}/usr/include/uClibc++" \ + LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" +endif + CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto confprog +ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) +# add workaround because libtool tries to link libstdc++ +post-configure: + ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ + ${WRKBUILD}/libtool +endif + post-install: ${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib ${CP} ${WRKINST}/usr/lib/libsigc-2.0.so.* ${IDIR_LIBSIGCXX}/usr/lib/ |