summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/buildhlp.mk2
-rw-r--r--package/git/Makefile5
-rw-r--r--package/git/patches/patch-configure_ac15
-rw-r--r--package/libiconv/Makefile1
-rw-r--r--target/linux/config/Config.in.input4
5 files changed, 23 insertions, 4 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 41f09d946..5fdc7011a 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -93,7 +93,7 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1)
else
@$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1
endif
- @-test -r ${WRKDIR}/.autoreconf_done && \
+ @-test ! -r ${WRKDIR}/.autoreconf_done || \
(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
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],
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 458581038..62cbeb0ee 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -24,5 +24,6 @@ $(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG
libiconv-install:
${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib
${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libcharset.so* ${IDIR_LIBICONV}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index dda525cda..51d25c4ac 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -140,6 +140,8 @@ config ADK_KPACKAGE_KMOD_USB_HID
tristate
select ADK_KERNEL_INPUT
select ADK_KERNEL_HID
+ select ADK_KERNEL_INPUT_KEYBOARD
+ select ADK_KERNEL_INPUT_MOUSEDEV
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
depends on ADK_TARGET_WITH_USB
@@ -156,7 +158,7 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
default n
config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
- prompt "kmod-input-mouse................. Mouse support (PS/2)"
+ prompt "kmod-input-mouse................. Mouse support"
tristate
select ADK_KERNEL_INPUT
depends on !ADK_KERNEL_INPUT_MOUSEDEV