diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libstdcxx | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libstdcxx')
| -rw-r--r-- | package/libstdcxx/Makefile | 4 | ||||
| -rw-r--r-- | package/libstdcxx/ipkg/libstdcxx.control | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 4e9a1c54a..ae07966ab 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -7,11 +7,13 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/glibc/Makefile.inc PKG_NAME:= libstdcxx +PKG_DESCR:= C++ support library +PKG_SECTION:= libs NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSTDCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib diff --git a/package/libstdcxx/ipkg/libstdcxx.control b/package/libstdcxx/ipkg/libstdcxx.control deleted file mode 100644 index 384ebc12b..000000000 --- a/package/libstdcxx/ipkg/libstdcxx.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libstdcxx -Priority: optional -Section: net -Depends: libgcc -Description: G++ support library |