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/glib2 | |
| 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/glib2')
| -rw-r--r-- | package/glib2/Makefile | 17 | ||||
| -rw-r--r-- | package/glib2/ipkg/glib2.control | 5 |
2 files changed, 11 insertions, 11 deletions
diff --git a/package/glib2/Makefile b/package/glib2/Makefile index 424d40344..2745ec1c3 100644 --- a/package/glib2/Makefile +++ b/package/glib2/Makefile @@ -5,17 +5,22 @@ include ${TOPDIR}/rules.mk -PKG_NAME= glib2 -PKG_VERSION= 2.18.1 -PKG_RELEASE= 1 -PKG_MD5SUM= d53836f7fdd9970d03e255e9d712bd83 +PKG_NAME:= glib2 +PKG_VERSION:= 2.18.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d53836f7fdd9970d03e255e9d712bd83 +PKG_DESCR:= low-level core library that forms the basis of GTK+ +PKG_SECTION:= libs +PKG_DEPENDS:= gettext libiconv libpthread +PKG_URL:= http://www.gtk.org/ +PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.18/ + DISTFILES= glib-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/glib-${PKG_VERSION} -MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.18/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB2,glib2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GLIB2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -I'${STAGING_DIR}/usr/include' CONFIGURE_STYLE= gnu diff --git a/package/glib2/ipkg/glib2.control b/package/glib2/ipkg/glib2.control deleted file mode 100644 index c3dbc208b..000000000 --- a/package/glib2/ipkg/glib2.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: glib2 -Priority: optional -Section: libs -Description: some broken toolkit -Depends: gettext, libiconv, libpthread |