OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
Browse Source

uclibc: Updated (0.9.28.3 -> 0.9.30.1), adapted legacy T2 patches and added some new ones from buidroot

user/chris/old/ruby
Nagy Károly Gábriel 15 years ago
committed by Alejandro Mery
parent
cd405e78a5
commit
0aad6a7608
16 changed files with 536 additions and 61 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +28
    -0
      base/uclibc/140-math_decl.patch
  2. +47
    -0
      base/uclibc/160-unifdef_fix.patch
  3. +57
    -0
      base/uclibc/180-dl_sysdep_inline.patch
  4. +55
    -0
      base/uclibc/300-fix-ppoll.patch
  5. +29
    -0
      base/uclibc/420-i386_strrchr_fix.patch.disable
  6. +113
    -0
      base/uclibc/430-i386_copysign.patch
  7. +29
    -0
      base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable
  8. +44
    -0
      base/uclibc/901-hi_lo_system_calls.patch.disable
  9. +2
    -2
      base/uclibc/add-dns-skipname.patch
  10. +0
    -30
      base/uclibc/fix_make_install.patch
  11. +16
    -18
      base/uclibc/ldconfig-glob.patch
  12. +33
    -0
      base/uclibc/mempcpy.patch
  13. +34
    -0
      base/uclibc/pkg_patch/openssl/uclibc-susv3-legacy.patch
  14. +19
    -7
      base/uclibc/uclibc.conf
  15. +3
    -4
      base/uclibc/uclibc.desc
  16. +27
    -0
      base/uclibc/uclibc.txt

+ 28
- 0
base/uclibc/140-math_decl.patch
View File

@ -0,0 +1,28 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/140-math_decl.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/140-math_decl.patch
--- ./libc/sysdeps/linux/common/bits/mathcalls.h.orig
+++ ./libc/sysdeps/linux/common/bits/mathcalls.h
@@ -229,7 +229,7 @@
/* Return nonzero if VALUE is not a number. */
-__MATHDECL_PRIV (int,__isnan,, (_Mdouble_ __value), (__const__));
+__MATHDECL_PRIV (int,isnan,, (_Mdouble_ __value), (__const__));
#if defined __USE_MISC || defined __USE_XOPEN
/* Return nonzero if VALUE is not a number. */

+ 47
- 0
base/uclibc/160-unifdef_fix.patch
View File

@ -0,0 +1,47 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/160-unifdef_fix.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch
--- ./extra/scripts/unifdef.c.orig 2008-04-28 01:10:00.000000000 +0200
+++ ./extra/scripts/unifdef.c 2009-08-25 15:20:08.000000000 +0200
@@ -206,7 +206,7 @@ static void done(void);
static void error(const char *);
static int findsym(const char *);
static void flushline(bool);
-static Linetype getline(void);
+static Linetype get_line(void);
static Linetype ifeval(const char **);
static void ignoreoff(void);
static void ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
for (;;) {
linenum++;
- lineval = getline();
+ lineval = get_line();
trans_table[ifstate[depth]][lineval]();
debug("process %s -> %s depth %d",
linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
* help from skipcomment().
*/
static Linetype
-getline(void)
+get_line(void)
{
const char *cp;
int cursym;

+ 57
- 0
base/uclibc/180-dl_sysdep_inline.patch
View File

@ -0,0 +1,57 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/180-dl_sysdep_inline.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/180-dl_sysdep_inline.patch
Index: uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h
===================================================================
--- ./ldso/ldso/arm/dl-sysdep.h.orig (revision 25503)
+++ ./ldso/ldso/arm/dl-sysdep.h (working copy)
@@ -15,7 +15,7 @@
GOT_BASE[1] = (unsigned long) MODULE; \
}
-static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
+static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p)
{
unsigned long i,t,inc;
i=p; t=0;
@@ -72,7 +72,7 @@
first element of the GOT. We used to use the PIC register to do this
without a constant pool reference, but GCC 4.2 will use a pseudo-register
for the PIC base, so it may not be in r10. */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
Elf32_Addr dynamic;
@@ -104,7 +104,7 @@
}
/* Return the run-time load address of the shared object. */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void)
{
extern void __dl_start __asm__ ("_dl_start");
@@ -128,7 +128,7 @@
return pcrel_addr - got_addr;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{

+ 55
- 0
base/uclibc/300-fix-ppoll.patch
View File

@ -0,0 +1,55 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/300-fix-ppoll.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff
It will match kernel's sigset_t starting from 0.9.31.
Please try attached patch.
--
vda
--- ./libc/sysdeps/linux/common/ppoll.c.orig
+++ ./libc/sysdeps/linux/common/ppoll.c
@@ -17,6 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <signal.h>
#include <sys/syscall.h>
#include <sys/poll.h>
@@ -26,9 +27,9 @@
# define __NR___libc_ppoll __NR_ppoll
static __always_inline
-_syscall4(int, __libc_ppoll, struct pollfd *, fds,
+_syscall5(int, __libc_ppoll, struct pollfd *, fds,
nfds_t, nfds, const struct timespec *, timeout,
- const __sigset_t *, sigmask)
+ const __sigset_t *, sigmask, size_t, sigsetsize)
int
ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
@@ -43,7 +44,7 @@
timeout = &tval;
}
- return __libc_ppoll(fds, nfds, timeout, sigmask);
+ return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8);
}
libc_hidden_def(ppoll)

+ 29
- 0
base/uclibc/420-i386_strrchr_fix.patch.disable
View File

@ -0,0 +1,29 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/420-i386_strrchr_fix.patch.disable
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/420-i386_strrchr_fix.patch
--- ./libc/string/i386/strrchr.c.orig
+++ ./libc/string/i386/strrchr.c
@@ -45,7 +45,7 @@
"leal -1(%%esi),%0\n"
"2:\ttestb %%al,%%al\n\t"
"jne 1b"
- :"=g" (__res), "=&S" (d0), "=&a" (d1) :"0" (0),"1" (s),"2" (c));
+ :"=r" (__res), "=&S" (d0), "=&a" (d1) :"0" (0),"1" (s),"2" (c));
return __res;
}
libc_hidden_def(strrchr)

+ 113
- 0
base/uclibc/430-i386_copysign.patch
View File

@ -0,0 +1,113 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/430-i386_copysign.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/430-i386_copysign.patch
--- ./libc/sysdeps/linux/i386/Makefile.arch.orig
+++ ./libc/sysdeps/linux/i386/Makefile.arch
@@ -9,6 +9,7 @@ CSRC := brk.c sigaction.c __syscall_erro
SSRC := \
__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
- sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S
+ sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S \
+ s_copysign.S s_copysignf.S s_copysignl.S
include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch
--- /dev/null
+++ ./libc/sysdeps/linux/i386/s_copysign.S
@@ -0,0 +1,25 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#define _ERRNO_H 1
+#include <features.h>
+#include <bits/errno.h>
+
+.text
+.global copysign
+.type copysign,%function
+copysign:
+ movl 16(%esp),%edx
+ movl 8(%esp),%eax
+ andl $0x80000000,%edx
+ andl $0x7fffffff,%eax
+ orl %edx,%eax
+ movl %eax,8(%esp)
+ fldl 4(%esp)
+ ret
+.size copysign,.-copysign
+
+libc_hidden_def(copysign)
+
--- /dev/null
+++ ./libc/sysdeps/linux/i386/s_copysignf.S
@@ -0,0 +1,25 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#define _ERRNO_H 1
+#include <features.h>
+#include <bits/errno.h>
+
+.text
+.global copysignf
+.type copysignf,%function
+copysignf:
+ movl 8(%esp),%edx
+ movl 4(%esp),%eax
+ andl $0x80000000,%edx
+ andl $0x7fffffff,%eax
+ orl %edx,%eax
+ movl %eax,4(%esp)
+ flds 4(%esp)
+ ret
+.size copysignf,.-copysignf
+
+libc_hidden_def(copysignf)
+
--- /dev/null
+++ ./libc/sysdeps/linux/i386/s_copysignl.S
@@ -0,0 +1,26 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
+ * Public domain.
+ */
+
+#define _ERRNO_H 1
+#include <features.h>
+#include <bits/errno.h>
+
+.text
+.global copysignl
+.type copysignl,%function
+copysignl:
+ movl 24(%esp),%edx
+ movl 12(%esp),%eax
+ andl $0x8000,%edx
+ andl $0x7fff,%eax
+ orl %edx,%eax
+ movl %eax,12(%esp)
+ fldt 4(%esp)
+ ret
+.size copysignl,.-copysignl
+
+libc_hidden_def(copysignl)
+

+ 29
- 0
base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable
View File

@ -0,0 +1,29 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch
[toolchain] uClibc-0.9.30.1: fix possible NULL pointer dereference (closes #5242)
--- ./libc/inet/getaddrinfo.c.orig
+++ ./libc/inet/getaddrinfo.c
@@ -187,6 +187,8 @@
}
for (runp = ifa; runp != NULL; runp = runp->ifa_next) {
+ if (runp->ifa_addr == NULL)
+ continue;
#if defined __UCLIBC_HAS_IPV4__
if (runp->ifa_addr->sa_family == PF_INET)
seen |= SEEN_IPV4;

+ 44
- 0
base/uclibc/901-hi_lo_system_calls.patch.disable
View File

@ -0,0 +1,44 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/901-hi_lo_system_calls.patch.disable
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/901-hi_lo_system_calls.patch
[toolchain] Do not save variables in hi or lo across system calls, fixes issues with gcc-4.4 (#5351)
The kernel does not save these registers across system calls. GCC 4.4
has gotten more agressive about using them for temporary variables, so
this shows up as intermittent crashes if you use a recent compiler.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
--- ./libc/sysdeps/linux/mips/bits/syscalls.h.orig
+++ ./libc/sysdeps/linux/mips/bits/syscalls.h
@@ -261,7 +261,7 @@
})
#define __SYSCALL_CLOBBERS "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", \
- "$14", "$15", "$24", "$25", "memory"
+ "$14", "$15", "$24", "$25", "hi", "lo", "memory"
#else /* N32 || N64 */
@@ -318,7 +318,7 @@
})
#define __SYSCALL_CLOBBERS "$1", "$3", "$10", "$11", "$12", "$13", \
- "$14", "$15", "$24", "$25", "memory"
+ "$14", "$15", "$24", "$25", "hi", "lo", "memory"
#endif

+ 2
- 2
base/uclibc/add-dns-skipname.patch
View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/add-dns-skipname.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -17,9 +17,9 @@
--- uClibc-0.9.27/libc/inet/resolv.c.orig 2005-02-01 11:16:03.000000000 -0800
+++ uClibc-0.9.27/libc/inet/resolv.c 2005-02-01 11:27:30.000000000 -0800
@@ -2543,4 +2543,85 @@
len = srcp - src;
return (len);
}
libc_hidden_def(ns_name_unpack)
+
+#define NS_TYPE_ELT 0x40 /* EDNS0 extended label type */
+#define DNS_LABELTYPE_BITSTRING 0x41

+ 0
- 30
base/uclibc/fix_make_install.patch
View File

@ -1,30 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/fix_make_install.patch
# Copyright (C) 2007 - 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2007-03-19 08:23:12.000000000 -0400
+++ ./Makefile 2007-03-19 08:23:49.000000000 -0400
@@ -163,8 +163,9 @@
else \
extra_exclude="" ; \
fi ; \
- tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \
- | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
+ find -L include ! -type d ! -path '*/.svn/*' ! -path '*/CVS/*' ! -path 'include/linux/*'\
+ ! -path 'include/asm/*' ! -path 'include/asm-*/*' | tar -chf - -T /dev/stdin \
+ | tar -xvf - -C $(PREFIX)$(DEVEL_PREFIX)
echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
$(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)

+ 16
- 18
base/uclibc/ldconfig-glob.patch
View File

@ -2,8 +2,8 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/ldconfig-glob.patch
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 2009 The OpenSDE Project
# Copyright (C) 2004 - 2007 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
@ -18,10 +18,9 @@
Add pathname pattern matching to ldconfig
-- Michael Tross
diff -ur uClibc-r11027/utils/ldconfig.c uClibc-r11027.work/utils/ldconfig.c
--- uClibc-r11027/utils/ldconfig.c 2000-01-01 00:00:00.000000000 +0100
+++ uClibc-r11027.work/utils/ldconfig.c 2005-10-14 18:14:31.000000000 +0200
@@ -34,6 +34,7 @@
--- ./utils/ldconfig.c.orig 2007-04-18 01:08:20.000000000 +0200
+++ ./utils/ldconfig.c 2007-05-08 05:37:25.000000000 +0200
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <link.h>
#include <fcntl.h>
@ -29,11 +28,10 @@ diff -ur uClibc-r11027/utils/ldconfig.c uClibc-r11027.work/utils/ldconfig.c
#include <errno.h>
#include <sys/stat.h>
#include <sys/mman.h>
@@ -977,7 +978,45 @@
warnx("Remove `%s' from `%s'\n", cp, LDSO_CONF);
continue;
}
- scan_dir(cp);
@@ -995,8 +996,45 @@
warnx("You should remove `%s' from `%s'", cp, LDSO_CONF);
continue;
}
+
+ /* ******************************* */
+
@ -41,7 +39,7 @@ diff -ur uClibc-r11027/utils/ldconfig.c uClibc-r11027.work/utils/ldconfig.c
+ int j;
+ char *realpath;
+ struct stat64 stat_buf;
+ if (glob(cp, 0, NULL, &result) == 0) {
+ if (glob(cp, GLOB_ONLYDIR, NULL, &result) == 0) {
+
+ for (j = 0; j < result.gl_pathc; j++) {
+
@ -65,14 +63,14 @@ diff -ur uClibc-r11027/utils/ldconfig.c uClibc-r11027.work/utils/ldconfig.c
+ warnx ("Can't stat %s [%i]", cp, errno);
+ }
+ else {
+ scan_dir(cp);
+ }
scan_dir(cp);
}
+ }
+ globfree (&result);
+
+ /* ******************************* */
+
+
}
free(extpath);
}
+ }
free(extpath);
}
#endif

+ 33
- 0
base/uclibc/mempcpy.patch
View File

@ -0,0 +1,33 @@
http://svn.exactcode.de/t2/trunk/package/base/uclibc/mempcpy.patch
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/mempcpy.patch
# Copyright (C) 2009 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
many __symbols are now hidden in uClibc, and at least __mempcpy is
used by some apps, so keep compatibility
Michael Tross
--- ./include/string.h.old 2006-09-26 18:32:31.000000000 +0200
+++ ./include/string.h 2006-09-27 21:30:52.000000000 +0200
@@ -235,6 +235,7 @@
__const void *__restrict __src, size_t __n)
__THROW __nonnull ((1, 2));
#endif
+#define __mempcpy mempcpy
extern void *mempcpy (void *__restrict __dest,
__const void *__restrict __src, size_t __n)
__THROW __nonnull ((1, 2));

+ 34
- 0
base/uclibc/pkg_patch/openssl/uclibc-susv3-legacy.patch
View File

@ -0,0 +1,34 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/pkg_patch/openssl/uclibc-susv3-legacy.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
sys/timeb.h / ftime are legacy, so don't enable them for uClibc
---
apps/speed.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openssl-0.9.8g/apps/speed.c
===================================================================
--- ./apps/speed.c.orig
+++ ./apps/speed.c
@@ -113,7 +113,7 @@
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
# define TIMEB
#endif

+ 19
- 7
base/uclibc/uclibc.conf
View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/uclibc.conf
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -88,7 +88,10 @@ default_config() {
echo "X UCLIBC_HAS_GNU_GETOPT"
echo "X UCLIBC_HAS_GLOB"
# make our ldconfig patch happy :-/
echo "X UCLIBC_HAS_GNU_GLOB"
echo "X UCLIBC_HAS_FLOATS"
}
runconf=0
@ -98,8 +101,8 @@ uclibc_config() {
# generate default config rules
default_config > $builddir/.config
eval $MAKE defconfig
conffiles_loop 2 TARGET_ARCH=$uC_arch
eval $MAKE TARGET_ARCH=$uC_arch ARCH=$uC_arch defconfig
conffiles_loop 2 TARGET_ARCH=$uC_arch ARCH=$uC_arch
}
var_remove_regex makeopt ' ' 'prefix=[^ ]*'
@ -122,17 +125,26 @@ var_append makeopt ' ' "CROSS=${archprefix}"
if atstage toolchain; then
var_append makeopt ' ' "headers"
var_append makeinstopt ' ' "install_dev"
var_append makeinstopt ' ' "install_headers"
else
var_append makeopt ' ' "pregen"
var_append makeopt ' ' "all"
var_append makeopt ' ' "utils"
var_append makeinstopt ' ' "install_dev"
var_append makeinstopt ' ' "install_runtime"
var_append makeinstopt ' ' "install_headers"
var_append makeinstopt ' ' "install"
var_append makeinstopt ' ' "install_utils"
fi
# inject kernel symlinks
hook_add preconf 5 'uclibc_kernellinks'
uclibc_kernellinks() {
local x=
# rm -rvf include/scsi kernel does not provide scsi headers yet, so don't delete them!!!
for x in $( ls -1d $root/usr/include/{asm,asm-*,linux} 2> /dev/null ); do
ln -svf $x include/
done
}
hook_add postdoc 5 'cp -vf .config $root/$docdir/'

+ 3
- 4
base/uclibc/uclibc.desc
View File

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../uclibc/uclibc.desc
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
@ -36,8 +36,7 @@
[L] LGPL
[S] Stable
[V] 0.9.28.3
[V] 0.9.30.1
[P] O 01---5---9 101.700
#[D] 301470184 uClibc-20061231.tar.bz2 http://www.uclibc.org/downloads/snapshots/
[D] 429602886 uClibc-0.9.28.3.tar.bz2 http://www.uclibc.org/downloads/
[D] 758585862 uClibc-0.9.30.1.tar.bz2 http://www.uclibc.org/downloads/

+ 27
- 0
base/uclibc/uclibc.txt
View File

@ -0,0 +1,27 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/uclibc.txt
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
= uClibc package notes =
== Patches ==
We have 3 patches marked as disabled, those are WIP, do not remove them!!!
420-i386_strrchr_fix.patch.disable
900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable
901-hi_lo_system_calls.patch.disable
== Quircks ==
We install the scsi headers provided by uClibc for now. At kernel updates
beware that scsi/scsi.h might be installed by the newer kernel headers.

Write Preview
Loading…
Cancel
Save