summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS6
-rw-r--r--package/autoconf/Makefile9
2 files changed, 15 insertions, 0 deletions
diff --git a/BUGS b/BUGS
index 3a0b24dff..bbb5275a8 100644
--- a/BUGS
+++ b/BUGS
@@ -1,2 +1,8 @@
- openssh on amd64 does not work, ssh-keygen endless loop
- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
+<<<<<<< HEAD
+- qemu-mips64* targets does not boot, kernel problem?
+- (cross-)compile from debian amd64 to f.e. qemu-x86_64 or shuttle with
+ either glibc or eglibc is broken, have sth. todo with target == host
+=======
+>>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index 07f525241..b7517b3b3 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -4,9 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= autoconf
+<<<<<<< HEAD
+PKG_VERSION:= 2.64
+PKG_RELEASE:= 2
+PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361
+=======
PKG_VERSION:= 2.65
PKG_RELEASE:= 1
PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b
+>>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
PKG_DESCR:= GNU autoconf
PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/autoconf/
@@ -19,6 +25,9 @@ $(eval $(call PKG_template,AUTOCONF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
post-install:
${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin
+ ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/share/autoconf
${CP} ${WRKINST}/usr/bin/auto* ${IDIR_AUTOCONF}/usr/bin
+ ${CP} ${WRKINST}/usr/share/autoconf/* \
+ ${IDIR_AUTOCONF}/usr/share/autoconf
include ${TOPDIR}/mk/pkg-bottom.mk