summaryrefslogtreecommitdiff
path: root/package/git
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-09-04 12:14:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-09-04 12:14:17 +0200
commit6b7fc6ca0f7b605f125450e7fda31df41f0fba2f (patch)
treed9a5873e6a555e1fb2cee659d3dc6ae10b0d8b7c /package/git
parent3128f7a0d2c0ea1475b19fc2f3855c6961c9ef58 (diff)
parent078bd7300119646866da8db791b61c342fd69f4b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/git')
-rw-r--r--package/git/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/git/Makefile b/package/git/Makefile
index 19a13b602..9a4c4dfde 100644
--- a/package/git/Makefile
+++ b/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