diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 15:10:15 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 15:10:15 +0100 |
| commit | 951f800266877865b77a43beadcdbae3e05de918 (patch) | |
| tree | 1d94435eedd60a07aee285f326e06f4a62bcd3d9 | |
| parent | 1a6d2ebae0efbdee792cb15165dc0ebca9a9831b (diff) | |
do not accidently link with libcharset, when NO_ICONV is set
| -rw-r--r-- | package/git/Makefile | 5 | ||||
| -rw-r--r-- | package/git/patches/patch-configure_ac | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/package/git/Makefile b/package/git/Makefile index 5829cec65..9f2c72106 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git PKG_VERSION:= 1.8.4.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6f63d103465b86ca0ebe4189ea54731c PKG_DESCR:= fast version control system PKG_SECTION:= scm -PKG_BUILDDEP:= openssl curl expat +PKG_BUILDDEP:= openssl curl expat autotool PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_URL:= http://git-scm.com/ PKG_SITES:= http://git-core.googlecode.com/files/ @@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf XAKE_FLAGS+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ NO_INSTALL_HARDLINKS=1 NO_GETTEXT=1 NO_ICONV=1 \ CURLDIR=${STAGING_TARGET_DIR} \ diff --git a/package/git/patches/patch-configure_ac b/package/git/patches/patch-configure_ac new file mode 100644 index 000000000..3aa0a15b5 --- /dev/null +++ b/package/git/patches/patch-configure_ac @@ -0,0 +1,15 @@ +--- git-1.8.4.2.orig/configure.ac 2013-10-28 19:17:38.000000000 +0100 ++++ git-1.8.4.2/configure.ac 2013-10-29 15:05:57.000000000 +0100 +@@ -876,10 +876,12 @@ AC_CHECK_HEADER([paths.h], + GIT_CONF_SUBST([HAVE_PATHS_H]) + # + # Define HAVE_LIBCHARSET_H if have libcharset.h ++if test -z "$NO_ICONV"; then + AC_CHECK_HEADER([libcharset.h], + [HAVE_LIBCHARSET_H=YesPlease], + [HAVE_LIBCHARSET_H=]) + GIT_CONF_SUBST([HAVE_LIBCHARSET_H]) ++fi + # + # Define HAVE_STRINGS_H if you have strings.h + AC_CHECK_HEADER([strings.h], |