summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/dropbear/Makefile6
-rw-r--r--package/git/Makefile3
2 files changed, 5 insertions, 4 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 4966d1088..b3756a8d9 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= dropbear
PKG_VERSION:= 2013.58
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 8d3579bbbfcea48404a3219643076450
PKG_DESCR:= SSH 2 server/client designed for embedded systems
PKG_SECTION:= net/security
@@ -71,8 +71,8 @@ do-install:
$(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/sbin
$(INSTALL_BIN) $(WRKBUILD)/dropbearmulti \
$(IDIR_DROPBEAR)/usr/sbin/dropbear
- ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/bin/scp
- ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/bin/ssh
+ ln -sf ../usr/sbin/dropbear $(IDIR_DROPBEAR)/bin/scp
+ ln -sf ../usr/sbin/dropbear $(IDIR_DROPBEAR)/bin/ssh
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
# subpackage dropbearconvert
diff --git a/package/git/Makefile b/package/git/Makefile
index 9a4c4dfde..e95221ad1 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -18,11 +18,12 @@ 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 \
+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} \
EXPATDIR=${STAGING_TARGET_DIR}
XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux
+CONFIGURE_ARGS+= --without-iconv
CONFIGURE_ENV+= ac_cv_c_c99_format=yes \
ac_cv_fread_reads_directories=no \
ac_cv_snprintf_returns_bogus=no