[uClibc/f19] Enable UCLIBC_HAS_RESOLVER_SUPPORT, UCLIBC_LINUX_MODULE_26,
Denys Vlasenko
vda at fedoraproject.org
Mon May 6 15:15:49 UTC 2013
commit c108cf2c96af24ca49cf459b66612c28ead63637
Author: Denys Vlasenko <dvlasenk at redhat.com>
Date: Mon May 6 17:05:22 2013 +0200
Enable UCLIBC_HAS_RESOLVER_SUPPORT, UCLIBC_LINUX_MODULE_26,
UCLIBC_HAS_SHA256/512_CRYPT_IMPL, UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
config options.
- fix __kernel_long_t problem.
uClibc-0.9.33.2_kernel_long.patch | 60 +++++++++++++++++++++++++++++++++++++
uClibc.config | 6 ++++
uClibc.spec | 10 +++++-
3 files changed, 75 insertions(+), 1 deletions(-)
---
diff --git a/uClibc-0.9.33.2_kernel_long.patch b/uClibc-0.9.33.2_kernel_long.patch
new file mode 100644
index 0000000..b31b37b
--- /dev/null
+++ b/uClibc-0.9.33.2_kernel_long.patch
@@ -0,0 +1,60 @@
+diff -urpN uClibc-0.9.33.2.old/libc/sysdeps/linux/arm/bits/kernel_types.h uClibc-0.9.33.2/libc/sysdeps/linux/arm/bits/kernel_types.h
+--- uClibc-0.9.33.2.old/libc/sysdeps/linux/arm/bits/kernel_types.h 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/libc/sysdeps/linux/arm/bits/kernel_types.h 2013-05-06 16:59:13.539258761 +0200
+@@ -16,6 +16,8 @@ typedef int __kernel_pid_t;
+ typedef unsigned short __kernel_ipc_pid_t;
+ typedef unsigned short __kernel_uid_t;
+ typedef unsigned short __kernel_gid_t;
++typedef long __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned int __kernel_size_t;
+ typedef int __kernel_ssize_t;
+ typedef int __kernel_ptrdiff_t;
+diff -urpN uClibc-0.9.33.2.old/libc/sysdeps/linux/i386/bits/kernel_types.h uClibc-0.9.33.2/libc/sysdeps/linux/i386/bits/kernel_types.h
+--- uClibc-0.9.33.2.old/libc/sysdeps/linux/i386/bits/kernel_types.h 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/libc/sysdeps/linux/i386/bits/kernel_types.h 2013-05-06 16:57:50.881426451 +0200
+@@ -25,6 +25,8 @@ typedef int __kernel_pid_t;
+ typedef unsigned short __kernel_ipc_pid_t;
+ typedef unsigned short __kernel_uid_t;
+ typedef unsigned short __kernel_gid_t;
++typedef long __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned int __kernel_size_t;
+ typedef int __kernel_ssize_t;
+ typedef int __kernel_ptrdiff_t;
+diff -urpN uClibc-0.9.33.2.old/libc/sysdeps/linux/ia64/bits/kernel_types.h uClibc-0.9.33.2/libc/sysdeps/linux/ia64/bits/kernel_types.h
+--- uClibc-0.9.33.2.old/libc/sysdeps/linux/ia64/bits/kernel_types.h 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/libc/sysdeps/linux/ia64/bits/kernel_types.h 2013-05-06 16:59:29.934225595 +0200
+@@ -27,6 +27,8 @@ typedef int __kernel_pid_t;
+ typedef int __kernel_ipc_pid_t;
+ typedef unsigned int __kernel_uid_t;
+ typedef unsigned int __kernel_gid_t;
++typedef long __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned long __kernel_size_t;
+ typedef long __kernel_ssize_t;
+ typedef long __kernel_ptrdiff_t;
+diff -urpN uClibc-0.9.33.2.old/libc/sysdeps/linux/powerpc/bits/kernel_types.h uClibc-0.9.33.2/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+--- uClibc-0.9.33.2.old/libc/sysdeps/linux/powerpc/bits/kernel_types.h 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/libc/sysdeps/linux/powerpc/bits/kernel_types.h 2013-05-06 16:58:17.379372606 +0200
+@@ -21,6 +21,8 @@ typedef int __kernel_pid_t;
+ typedef int __kernel_ipc_pid_t;
+ typedef unsigned int __kernel_uid_t;
+ typedef unsigned int __kernel_gid_t;
++typedef long __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned long __kernel_size_t;
+ typedef long __kernel_ssize_t;
+ typedef long __kernel_ptrdiff_t;
+diff -urpN uClibc-0.9.33.2.old/libc/sysdeps/linux/x86_64/bits/kernel_types.h uClibc-0.9.33.2/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+--- uClibc-0.9.33.2.old/libc/sysdeps/linux/x86_64/bits/kernel_types.h 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/libc/sysdeps/linux/x86_64/bits/kernel_types.h 2013-05-06 16:57:33.139462550 +0200
+@@ -25,6 +25,8 @@ typedef int __kernel_pid_t;
+ typedef int __kernel_ipc_pid_t;
+ typedef unsigned int __kernel_uid_t;
+ typedef unsigned int __kernel_gid_t;
++typedef long __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned long __kernel_size_t;
+ typedef long __kernel_ssize_t;
+ typedef long __kernel_ptrdiff_t;
diff --git a/uClibc.config b/uClibc.config
index 6375e2b..e1c1d39 100644
--- a/uClibc.config
+++ b/uClibc.config
@@ -74,6 +74,7 @@ UCLIBC_GRP_BUFFER_SIZE=256
#
# Support various families of functions
#
+UCLIBC_LINUX_MODULE_26=y
UCLIBC_LINUX_MODULE_24=y
UCLIBC_LINUX_SPECIFIC=y
UCLIBC_HAS_GNU_ERROR=y
@@ -89,6 +90,8 @@ UCLIBC_HAS_EPOLL=y
UCLIBC_HAS_XATTR=y
UCLIBC_HAS_PROFILING=y
UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_SHA256_CRYPT_IMPL=y
+UCLIBC_HAS_SHA512_CRYPT_IMPL=y
UCLIBC_HAS_CRYPT=y
UCLIBC_HAS_NETWORK_SUPPORT=y
UCLIBC_HAS_SOCKET=y
@@ -102,6 +105,7 @@ UCLIBC_USE_NETLINK=y
# UCLIBC_HAS_BSD_RES_CLOSE is not set
UCLIBC_HAS_COMPAT_RES_STATE=y
# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
UCLIBC_HAS_LIBRESOLV_STUB=y
UCLIBC_HAS_LIBNSL_STUB=y
@@ -139,6 +143,7 @@ UCLIBC_HAS_STDIO_PUTC_MACRO=y
UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y
UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_ERRNO_MESSAGES=y
@@ -158,6 +163,7 @@ UCLIBC_HAS_FNMATCH_OLD=y
UCLIBC_HAS_WORDEXP=y
UCLIBC_HAS_NFTW=y
UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
UCLIBC_HAS_GLOB=y
UCLIBC_HAS_GNU_GLOB=y
UCLIBC_HAS_UTMPX=y
diff --git a/uClibc.spec b/uClibc.spec
index 8f9065d..043c8b7 100644
--- a/uClibc.spec
+++ b/uClibc.spec
@@ -1,6 +1,6 @@
Name: uClibc
Version: 0.9.33.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C library for embedded Linux
Group: Development/Libraries
@@ -8,6 +8,7 @@ License: LGPLv2
URL: http://www.uclibc.org/
Source0: http://www.uclibc.org/downloads/%{name}-%{version}.tar.xz
Source1: uClibc.config
+Patch1: uClibc-0.9.33.2_kernel_long.patch
# This package only contains a static library
%global debug_package %{nil}
@@ -34,6 +35,7 @@ needed for uClibc package.
%prep
%setup -q -n %{name}-%{version}
+%patch1 -b .kernel_long -p1
cat %{SOURCE1} >.config1
iconv -f windows-1252 -t utf-8 README >README.pom
@@ -84,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT/include/
%{_libdir}/uClibc
%changelog
+* Mon May 6 2013 Denys Vlasenko <dvlasenko at redhat.com> - 0.9.32-3
+- Enable UCLIBC_HAS_RESOLVER_SUPPORT, UCLIBC_LINUX_MODULE_26,
+ UCLIBC_HAS_SHA256/512_CRYPT_IMPL, UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+ config options.
+- fix __kernel_long_t problem.
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.33.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list