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/gdb | |
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/gdb')
-rw-r--r-- | package/gdb/Makefile | 9 | ||||
-rw-r--r-- | package/gdb/ipkg/gdb.control | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 2167ce7e3..395a7af4c 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -5,12 +5,15 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/gdb/Makefile.inc + +PKG_DESCR:= GNU debugger +PKG_SECTION:= comp +PKG_DEPENDS:= libthread_db libncurses + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib -TLDFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib TCFLAGS+= ${TCPPFLAGS} -fPIC CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ diff --git a/package/gdb/ipkg/gdb.control b/package/gdb/ipkg/gdb.control deleted file mode 100644 index 43a0a8ad8..000000000 --- a/package/gdb/ipkg/gdb.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gdb -Priority: optional -Section: devel -Depends: libthread_db -Description: GNU Debugger |