瀏覽代碼

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 12 年之前
父節點
當前提交
6b7fc6ca0f
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      package/git/Makefile

+ 5 - 5
package/git/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.8.1.2
+PKG_VERSION:=		1.8.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9f912370a1831c851ff8df171e8a7218
+PKG_MD5SUM:=		355768a1c70d0cb4fedf4b598ac1375b
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		openssl curl expat
@@ -19,13 +19,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
-			NO_INSTALL_HARDLINKS=1 \
-			CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR}
+			NO_INSTALL_HARDLINKS=1 NO_GETTEXT=1 NO_ICONV=1 \
+			CURLDIR=${STAGING_TARGET_DIR} \
+			EXPATDIR=${STAGING_TARGET_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
 			ac_cv_snprintf_returns_bogus=no
-TARGET_LDFLAGS+=	-lintl -liconv
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core