summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-30 17:30:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-30 17:30:11 +0100
commitd72530b6ebf2009eb2c9f9c7cb6222c140b711b4 (patch)
tree29c66c8a0f1fb0715c4b9cb922d065f5c8b5fb6a
parent202e4390b1cad4941c78e7ddef15e9006f6a79ec (diff)
fix make allmodconfig for alix1c-eglibc
-rw-r--r--package/aufs2-util/Makefile9
-rw-r--r--package/cryptinit/Makefile1
-rw-r--r--package/cups/patches/patch-scheduler_auth_c10
-rw-r--r--package/dansguardian/patches/patch-src_ConnectionHandler_cpp10
-rw-r--r--package/freeradius-client/Makefile4
-rw-r--r--package/iftop/Makefile10
-rw-r--r--package/libXaw/Makefile2
-rw-r--r--package/libvirt/Makefile8
-rw-r--r--package/valgrind/patches/patch-configure16
-rw-r--r--package/zsh/Makefile8
10 files changed, 53 insertions, 25 deletions
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 36b1b7bba..e0c69b166 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -18,11 +18,16 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
MAKE_FLAGS+= KDIR=${LINUX_DIR}
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
do-extract:
mkdir -p ${WRKBUILD}
${CP} ./src/* ${WRKBUILD}/
+post-install:
+ $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin
+ $(INSTALL_BIN) ${WRKINST}/sbin/{u,}mount.aufs \
+ $(IDIR_AUFS_UTIL)/sbin
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 5f1d250bf..6969ecc6e 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -39,5 +39,6 @@ do-build:
do-install:
$(CP) ./files/initramfs_list $(LINUX_DIR)
$(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR)
+ @touch $(IDIR_CRYPTINIT)/.cryptinit
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c
new file mode 100644
index 000000000..d9892c206
--- /dev/null
+++ b/package/cups/patches/patch-scheduler_auth_c
@@ -0,0 +1,10 @@
+--- cups-1.4.2.orig/scheduler/auth.c 2009-05-27 00:01:23.000000000 +0200
++++ cups-1.4.2/scheduler/auth.c 2009-12-30 12:30:13.000000000 +0100
+@@ -57,6 +57,7 @@
+ * Include necessary headers...
+ */
+
++#define _GNU_SOURCE
+ #include "cupsd.h"
+ #include <grp.h>
+ #ifdef HAVE_SHADOW_H
diff --git a/package/dansguardian/patches/patch-src_ConnectionHandler_cpp b/package/dansguardian/patches/patch-src_ConnectionHandler_cpp
new file mode 100644
index 000000000..16daddd94
--- /dev/null
+++ b/package/dansguardian/patches/patch-src_ConnectionHandler_cpp
@@ -0,0 +1,10 @@
+--- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100
++++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-12-30 13:19:14.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <istream>
++#include <limits.h>
+
+ #ifdef ENABLE_ORIG_IP
+ #include <linux/types.h>
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 6eaa74e8a..f6e94cf6f 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= freeradius-client
PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
-PKG_BUILDDEP+= openssl
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
PKG_DESCR:= RADIUS client
PKG_SECTION:= net
PKG_DEPENDS:= libopenssl
+PKG_BUILDDEP+= openssl
PKG_URL:= http://www.freeradius.org
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \
http://freeradius.portal-to-web.de/ \
@@ -26,7 +26,7 @@ CONFIGURE_ENV+= ac_cv_func_uname=no
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-do-install:
+post-install:
${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/radiusclient \
${IDIR_FREERADIUS_CLIENT}/usr/sbin
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index a5bd4e555..c6059a58b 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -18,12 +18,12 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IFTOP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
-pots-install:
+post-install:
${INSTALL_DIR} ${IDIR_IFTOP}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/${PKG_NAME} ${IDIR_IFTOP}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/iftop ${IDIR_IFTOP}/usr/bin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index fd707feb1..4d6277f05 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -23,6 +23,6 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libXaw.so* ${IDIR_LIBXAW}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libXaw?.so* ${IDIR_LIBXAW}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 7d3582960..1746159fe 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -5,13 +5,13 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libvirt
PKG_VERSION:= 0.7.4
-PKG_RELEASE:= 1
-PKG_BUILDDEP+= libxml2 gnutls python
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa
PKG_DESCR:= virtualization API
PKG_SECTION:= utils
PKG_DEPENDS:= libxml2 libgnutls python
-PKG_URL:= http://www.libvirt.org
+PKG_BUILDDEP+= libxml2 gnutls python
+PKG_URL:= http://www.libvirt.org/
PKG_SITES:= ftp://libvirt.org/libvirt/
PKG_HOST_DEPENDS:= !freebsd
@@ -26,7 +26,9 @@ CONFIGURE_ARGS+= --without-xen \
--without-uml \
--without-esx \
--without-openvz \
+ --without-lxc \
--without-vbox \
+ --disable-silent-rules \
--without-sasl
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure
index c49444d12..9867b5309 100644
--- a/package/valgrind/patches/patch-configure
+++ b/package/valgrind/patches/patch-configure
@@ -23,15 +23,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
-+ GLIBC_210
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
++ GLIBC_211
+ #endif
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "GLIBC_210" >/dev/null 2>&1; then
-+ libc="2.10"
++ $EGREP "GLIBC_211" >/dev/null 2>&1; then
++ libc="2.11"
+fi
+rm -f conftest*
+
@@ -42,12 +42,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
;;
-+ 2.10)
-+ echo "$as_me:$LINENO: result: 2.10 family" >&5
-+echo "${ECHO_T}2.10 family" >&6
++ 2.11)
++ echo "$as_me:$LINENO: result: 2.11 family" >&5
++echo "${ECHO_T}2.11 family" >&6
+
+cat >>confdefs.h <<\_ACEOF
-+#define GLIBC_2_10 1
++#define GLIBC_2_11 1
+_ACEOF
+
+ DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
diff --git a/package/zsh/Makefile b/package/zsh/Makefile
index 89d977b91..7d44e0f85 100644
--- a/package/zsh/Makefile
+++ b/package/zsh/Makefile
@@ -9,16 +9,16 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 1b08c063f02d595709eaad1548c4e392
PKG_DESCR:= Z Shell
PKG_SECTION:= shells
-PKG_URL:= http://www.zsh.org
+PKG_URL:= http://www.zsh.org/
PKG_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
$(INSTALL_DIR) $(IDIR_ZSH)/bin