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/glib/Makefile | |
| 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/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 659998f42..bcfbcc801 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -9,14 +9,14 @@ PKG_NAME:= glib PKG_VERSION:= 1.2.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6fe30dad87c77b91b632def29dd69ef9 -MASTER_SITES:= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ +PKG_SITES:= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \ http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= glib_cv_sizeof_gmutex=24 \ |