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/binutils | |
| 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/binutils')
| -rw-r--r-- | package/binutils/Makefile | 8 | ||||
| -rw-r--r-- | package/binutils/ipkg/binutils.control | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 9409ab002..57b564df0 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -5,9 +5,13 @@ include ${TOPDIR}/rules.mk include ${TOPDIR}/toolchain/binutils/Makefile.inc + +PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..) +PKG_SECTION:= comp + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-werror @@ -16,7 +20,7 @@ INSTALL_STYLE= auto post-patch: ${PREVENT_PATCH} ${PATCH} ${WRKDIST} \ - ${TOPDIR}/toolchain/binutils/${BINUTILS_VERSION} \*.patch + ${TOPDIR}/toolchain/binutils/patches \*.patch post-install: ${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib diff --git a/package/binutils/ipkg/binutils.control b/package/binutils/ipkg/binutils.control deleted file mode 100644 index bf98f2634..000000000 --- a/package/binutils/ipkg/binutils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: binutils -Priority: optional -Section: comp -Description: binary utilities |