From ef3fe1bef6581c66af3858d540343e011cb9fdd6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Dec 2011 12:15:18 -0300 Subject: cdrkit: bump to version 1.1.11 and adjust style Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cdrkit/cdrkit-1.1.10-no-rcmd.patch | 22 ---------------------- package/cdrkit/cdrkit-1.1.11-no-rcmd.patch | 22 ++++++++++++++++++++++ package/cdrkit/cdrkit.mk | 14 +++++++++----- 3 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 package/cdrkit/cdrkit-1.1.10-no-rcmd.patch create mode 100644 package/cdrkit/cdrkit-1.1.11-no-rcmd.patch (limited to 'package/cdrkit') diff --git a/package/cdrkit/cdrkit-1.1.10-no-rcmd.patch b/package/cdrkit/cdrkit-1.1.10-no-rcmd.patch deleted file mode 100644 index 294779f7a..000000000 --- a/package/cdrkit/cdrkit-1.1.10-no-rcmd.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] fix build with uClibc - -cdrkit unconditionally enables code using rcmd(3), which isn't available -on uClibc. - -Signed-off-by: Peter Korsgaard ---- - include/xconfig.h.in | 1 - - 1 file changed, 1 deletion(-) - -Index: cdrkit-1.1.10/include/xconfig.h.in -=================================================================== ---- cdrkit-1.1.10.orig/include/xconfig.h.in -+++ cdrkit-1.1.10/include/xconfig.h.in -@@ -187,7 +187,6 @@ - * they are placed before the large file tests. - */ - --#define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ - #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ - #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ - #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ diff --git a/package/cdrkit/cdrkit-1.1.11-no-rcmd.patch b/package/cdrkit/cdrkit-1.1.11-no-rcmd.patch new file mode 100644 index 000000000..294779f7a --- /dev/null +++ b/package/cdrkit/cdrkit-1.1.11-no-rcmd.patch @@ -0,0 +1,22 @@ +[PATCH] fix build with uClibc + +cdrkit unconditionally enables code using rcmd(3), which isn't available +on uClibc. + +Signed-off-by: Peter Korsgaard +--- + include/xconfig.h.in | 1 - + 1 file changed, 1 deletion(-) + +Index: cdrkit-1.1.10/include/xconfig.h.in +=================================================================== +--- cdrkit-1.1.10.orig/include/xconfig.h.in ++++ cdrkit-1.1.10/include/xconfig.h.in +@@ -187,7 +187,6 @@ + * they are placed before the large file tests. + */ + +-#define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ + #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ + #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ + #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk index 9eebe6e07..fc22c1886 100644 --- a/package/cdrkit/cdrkit.mk +++ b/package/cdrkit/cdrkit.mk @@ -1,9 +1,13 @@ -CDRKIT_VERSION=1.1.10 -CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz -CDRKIT_SITE=http://www.cdrkit.org/releases/ +############################################################# +# +# cdrkit +# +############################################################# -CDRKIT_DEPENDENCIES=libcap bzip2 zlib -HOST_CDRKIT_DEPENDENCIES=host-libcap host-bzip2 host-zlib +CDRKIT_VERSION = 1.1.11 +CDRKIT_SITE = http://www.cdrkit.org/releases +CDRKIT_DEPENDENCIES = libcap bzip2 zlib +HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib ifeq ($(BR2_ENDIAN),"BIG") CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1 -- cgit v1.2.3