Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 13 insertions, 6 deletions

diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index c7d2a4ee6..5120212a0 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -37,7 +37,6 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
 		${IDIR_LIBDEVMAPPER}/usr/lib
-	chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so*
 	# device-mapper
 	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 542f72d9a..7895198a5 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -23,6 +23,5 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib/
-	chmod u+w ${IDIR_LIBREADLINE}/usr/lib/*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index 3eb849626..8f605261a 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -31,6 +31,5 @@ post-install:
 	${INSTALL_DIR} ${IDIR_TCL}/usr/lib ${IDIR_TCL}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_TCL}/usr/bin
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_TCL}/usr/lib
-	chmod u+w ${IDIR_TCL}/usr/lib/libtcl8.5.so	# for strip
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tcsh/patches/patch-sh_h b/package/tcsh/patches/patch-sh_h
index b638e850f..029fca58f 100644
--- a/package/tcsh/patches/patch-sh_h
+++ b/package/tcsh/patches/patch-sh_h
@@ -1,5 +1,14 @@
 --- tcsh-6.17.00.orig/sh.h	2009-06-25 23:27:37.000000000 +0200
-+++ tcsh-6.17.00/sh.h	2010-02-15 18:45:11.000000000 +0100
++++ tcsh-6.17.00/sh.h	2010-07-31 19:48:01.000000000 +0200
+@@ -338,7 +338,7 @@ static inline void ignore(intptr_t a)
+ # include <sys/filio.h>
+ #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */
+ 
+-#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D)
++#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) && !defined(__FreeBSD__)
+ # include <sys/file.h>
+ #endif	/* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */
+ 
 @@ -375,9 +375,11 @@ static inline void ignore(intptr_t a)
  #include <pwd.h>
  #include <grp.h>
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index 168938952..08503bafd 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -87,7 +87,7 @@ freebsd() {
 
 freebsd_full() {
 	echo "Preparing FreeBSD for full OpenADK package builds"
-	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL
+	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL autoconf262
 }
 
 case $os in 
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 0c7550d8e..951362d35 100644
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -54,6 +54,7 @@ find $TARGETS -type f -a -exec file {} \; | \
 	esac
 	echo "$SELF: $V:$S"
 	echo "-> $T $F"
+	eval "chmod u+w $F"
 	eval "$T $F"
 done
 exit 0
diff --git a/target/qemu-x86/uclibc.config b/target/qemu-x86/uclibc.config
index f98da5b03..fabe9cec2 100644
--- a/target/qemu-x86/uclibc.config
+++ b/target/qemu-x86/uclibc.config
@@ -109,7 +109,7 @@ UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_GETPT=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y