diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
| commit | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (patch) | |
| tree | b48cc775042b4274dce470527826007de7a7fa84 /package/cxxtools | |
| parent | 18b3987c6d890f02c80b976b6cf6835053ef1fe9 (diff) | |
| parent | ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 (diff) | |
Merge commit 'origin/confgen'
finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos
Conflicts:
.gitignore
Makefile
mk/build.mk
package/eglibc/Config.in
package/glibc/Config.in
package/uclibc++/Config.in
package/uclibc/Config.in
rules.mk
Diffstat (limited to 'package/cxxtools')
| -rw-r--r-- | package/cxxtools/Config.in | 26 | ||||
| -rw-r--r-- | package/cxxtools/Makefile | 8 |
2 files changed, 2 insertions, 32 deletions
diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in deleted file mode 100644 index d7dcdb87d..000000000 --- a/package/cxxtools/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config ADK_PACKAGE_CXXTOOLS - prompt "cxxtools.......................... cxxtools" - tristate - default n - select ADK_PACKAGE_LIBICONV - help - http://www.tntnet.org - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_CXXTOOLS -default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_CXXTOOLS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - depends on ADK_BROKEN - help - -endchoice diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 36e91f35c..0de136708 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -6,6 +6,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv +PKG_CXX:= CXXTOOLS PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net @@ -15,12 +17,6 @@ PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) |