mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
22
package/cdrkit/0001-no-rcmd.patch
Normal file
22
package/cdrkit/0001-no-rcmd.patch
Normal file
@@ -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 <jacmet@sunsite.dk>
|
||||
---
|
||||
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 */
|
||||
@@ -0,0 +1,47 @@
|
||||
From 9454ef47db30caa4359766c8730d9d92f65c64f7 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Sat, 8 Aug 2015 22:58:57 +0200
|
||||
Subject: [PATCH] define __THROW to avoid build issue with musl
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
---
|
||||
genisoimage/sha256.h | 4 ++++
|
||||
genisoimage/sha512.h | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h
|
||||
index e7f4cb9..bcae7ef 100644
|
||||
--- a/genisoimage/sha256.h
|
||||
+++ b/genisoimage/sha256.h
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
+/* define __THROW to avoid build issue when it's not available from the libc */
|
||||
+#ifndef __THROW
|
||||
+# define __THROW
|
||||
+#endif
|
||||
|
||||
/* Structure to save state of computation between the single steps. */
|
||||
struct sha256_ctx
|
||||
diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h
|
||||
index 7298355..8cee8b0 100644
|
||||
--- a/genisoimage/sha512.h
|
||||
+++ b/genisoimage/sha512.h
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
+/* define __THROW to avoid build issue when it's not available from the libc */
|
||||
+#ifndef __THROW
|
||||
+# define __THROW
|
||||
+#endif
|
||||
|
||||
/* Structure to save state of computation between the single steps. */
|
||||
struct sha512_ctx
|
||||
--
|
||||
2.4.3
|
||||
|
||||
13
package/cdrkit/Config.in
Normal file
13
package/cdrkit/Config.in
Normal file
@@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_CDRKIT
|
||||
bool "cdrkit"
|
||||
depends on BR2_USE_MMU # fork
|
||||
# Needed for libbz
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_LIBCAP
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
cdrkit is a suite of programs for recording CDs and DVDs,
|
||||
blanking CD-RW media, creating ISO-9660 filesystem images,
|
||||
extracting audio CD data, and more.
|
||||
|
||||
http://www.cdrkit.org/
|
||||
2
package/cdrkit/cdrkit.hash
Normal file
2
package/cdrkit/cdrkit.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/cdrkit_1.1.11-3.dsc
|
||||
sha256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da cdrkit_1.1.11.orig.tar.gz
|
||||
22
package/cdrkit/cdrkit.mk
Normal file
22
package/cdrkit/cdrkit.mk
Normal file
@@ -0,0 +1,22 @@
|
||||
################################################################################
|
||||
#
|
||||
# cdrkit
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CDRKIT_VERSION = 1.1.11
|
||||
CDRKIT_SOURCE = cdrkit_$(CDRKIT_VERSION).orig.tar.gz
|
||||
CDRKIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit
|
||||
CDRKIT_DEPENDENCIES = libcap bzip2 zlib
|
||||
HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib
|
||||
CDRKIT_LICENSE = GPL-2.0
|
||||
CDRKIT_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_ENDIAN),"BIG")
|
||||
CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=1
|
||||
else
|
||||
CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
$(eval $(host-cmake-package))
|
||||
Reference in New Issue
Block a user