diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/klibc/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/klibc/files')
-rw-r--r-- | dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch | 13 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch | 12 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch | 15 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch | 88 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc.m4 | 94 |
5 files changed, 0 insertions, 222 deletions
diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch deleted file mode 100644 index a5bb91765287..000000000000 --- a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index c2bfd2f..8066bda 100644 ---- a/usr/klibc/Kbuild -+++ b/usr/klibc/Kbuild -@@ -152,7 +152,7 @@ # build interp.o - targets += interp.o - - quiet_cmd_interp = BUILD $@ -- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ -+ cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__ \ - -DLIBDIR=\"$(SHLIBDIR)\" \ - -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch deleted file mode 100644 index 94a0caee2526..000000000000 --- a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in ---- klibc-1.5.7-orig/klcc/klcc.in 2007-12-03 01:17:26.000000000 +0100 -+++ klibc-1.5.7/klcc/klcc.in 2007-12-03 01:18:39.000000000 +0100 -@@ -259,7 +259,7 @@ if ( $operation ne '' ) { - unlink(@rmobjs); - - if ( $strip && !$rv ) { -- $rv = mysystem($STRIP, @STRIPFLAGS, $output); -+ $rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out'); - } - } - diff --git a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch deleted file mode 100644 index 3ddf834d46da..000000000000 --- a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nuar --exclude '*.g' --exclude '*.cmd' klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c ---- a/usr/utils/mkfifo.c 2012-10-03 09:41:43.000000000 -0700 -+++ b/usr/utils/mkfifo.c 2013-12-26 13:19:34.270949780 -0800 -@@ -13,6 +13,11 @@ - - char *progname; - -+int mkfifo (const char *__p, mode_t __m) -+{ -+ return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0); -+} -+ - static int make_fifo(char *dir) - { - if (mkfifo(dir, leaf_mode)) { diff --git a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch b/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch deleted file mode 100644 index 7d253977e998..000000000000 --- a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch +++ /dev/null @@ -1,88 +0,0 @@ -Update header locations for uapi & generated - -In the v3.6 kernel, many of the headers were split out into a uapi variant. -klibc should be using those variants to compile. - -There is also a generated subdir, to seperate out generated headers. - -The old kernel header location needs to be included as well, because -linux/compiler.h is available only in the base include directory. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar klibc-2.0.3.orig/scripts/Kbuild.klibc klibc-2.0.3/scripts/Kbuild.klibc ---- klibc-2.0.3.orig/scripts/Kbuild.klibc 2013-12-03 10:53:46.000000000 -0800 -+++ klibc-2.0.3/scripts/Kbuild.klibc 2013-12-26 14:39:07.113906101 -0800 -@@ -77,7 +77,10 @@ - KLIBCCFLAGS := - - # Defaults for arch to override --KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \ -+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include - - # Arch specific definitions for klibc - include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG -@@ -116,6 +119,9 @@ --KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ -+KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include/uapi \ -+ -I$(KLIBCKERNELSRC)/include/generated/uapi \ -+ -I$(KLIBCKERNELSRC)/include/generated \ -+ -I$(KLIBCKERNELSRC)/include \ - $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ - -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ - $(KLIBCARCHINCFLAGS) - - # klibc definitions -diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG klibc-2.0.3/usr/klibc/arch/i386/MCONFIG ---- klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG 2013-12-03 10:53:46.000000000 -0800 -+++ klibc-2.0.3/usr/klibc/arch/i386/MCONFIG 2013-12-26 14:44:56.349161344 -0800 -@@ -34,3 +34,6 @@ - - # Asm includes for i386 are in the merged x86 tree --KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include -diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG ---- klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG 2013-12-03 10:53:46.000000000 -0800 -+++ klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG 2013-12-26 14:44:56.350161362 -0800 -@@ -24,6 +24,9 @@ - - # The kernel so far has both asm-ppc* and asm-powerpc. --KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include - - # The asm include files live in asm-powerpc - KLIBCASMARCH = powerpc -diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG ---- klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG 2013-12-03 10:53:46.000000000 -0800 -+++ klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG 2013-12-26 14:44:56.350161362 -0800 -@@ -22,6 +22,9 @@ - - # The kernel so far has both asm-ppc* and asm-powerpc. --KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \ -+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include - - # The asm include files live in asm-powerpc - KLIBCASMARCH = powerpc -diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG ---- klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG 2013-12-03 10:53:46.000000000 -0800 -+++ klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG 2013-12-26 14:44:54.522128579 -0800 -@@ -37,3 +37,6 @@ - - # Asm includes for x86_64 are in the merged x86 tree --KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \ -+ -I$(KLIBCKERNELOBJ)/arch/x86/include diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4 deleted file mode 100644 index 389226974506..000000000000 --- a/dev-libs/klibc/files/klibc.m4 +++ /dev/null @@ -1,94 +0,0 @@ -# klibc.m4 serial 99 -## Copyright (C) 1995-2003 Free Software Foundation, Inc. -## This file is free software, distributed under the terms of the GNU -## General Public License. As a special exception to the GNU General -## Public License, this file may be distributed as part of a program -## that contains a configuration script generated by Autoconf, under -## the same distribution terms as the rest of that program. -## -## This file can can be used in projects which are not available under -## the GNU General Public License or the GNU Library General Public -## License but which still want to provide support for the GNU gettext -## functionality. -## Please note that the actual code of the KLIBC Library is partly covered -## by the GNU Library General Public License, and party copyrighted by the -## Regents of The University of California, and the rest is covered by a -## MIT style license. - -# Authors: -# Martin Schlemmer <azarah@nosferatu.za.org>, 2005. - - -# AC_CHECK_KLIBC -# -------------- -# Check if the user wants KLIBC support enabled. If so, set KLIBC=yes and -# fill in KLIBC_PREFIX, KLIBC_BINDIR, KLIBC_SBINDIR, KLIBC_LIBDIR and -# KLIBC_INCLUDEDIR. CC is also set to the proper klcc executable. -# NOTE: This should be called before AC_PROG_CC, and before header, function -# or type checks. -AC_DEFUN([AC_CHECK_KLIBC], -[AC_BEFORE([$0], [AC_PROG_CC]) -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_ARG_ENABLE([klibc], - [AS_HELP_STRING([--enable-klibc], - [Enable linking to klibc [no]. You need at - least klibc-1.0 or later for this. Set KLCC - to the absolute file name of klcc if not in - the PATH])], - [KLIBC=$enableval], [KLIBC=no]) -AC_ARG_ENABLE([klibc-layout], - [AS_HELP_STRING([--enable-klibc-layout], - [Enable installing binaries, libraries and - headers into the klibc prefix [yes] ])], - [if test "X$KLIBC" != Xno; then - KLIBC_LAYOUT=$enableval - else - KLIBC_LAYOUT=no - fi], - [if test "X$KLIBC" != Xno; then - KLIBC_LAYOUT=yes - else - KLIBC_LAYOUT=no - fi]) - -if test "X$KLIBC" != Xno; then - # Basic cross compiling support. I do not think it is wise to use - # AC_CHECK_TOOL, because if we are cross compiling, we do not want - # just 'klcc' to be returned ... - if test "${host_alias}" != "${build_alias}"; then - AC_CHECK_PROGS([KLCC], [${host_alias}-klcc], [no]) - else - AC_CHECK_PROGS([KLCC], [klcc], [no]) - fi - if test "X$KLCC" = Xno; then - AC_MSG_ERROR([cannot find klibc frontend 'klcc'!]) - fi - - CC="$KLCC" - CFLAGS="-Os" - - KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)" - KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)" - KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)" - KLIBC_SBIN_DIR="${KLIBC_PREFIX}/${KLIBC_KCROSS}sbin" - KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)" - KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)" - - if test "X$KLIBC_LAYOUT" != Xno; then - prefix="$KLIBC_PREFIX" - bindir="$KLIBC_BIN_DIR" - sbindir="$KLIBC_SBIN_DIR" - libdir="$KLIBC_LIB_DIR" - includedir="$KLIBC_INCLUDE_DIR" - fi - - # At least KLIBC_LIB_DIR should be valid, else klibc is too old or - # something went wrong - if test ! -d "$KLIBC_LIB_DIR"; then - AC_MSG_ERROR([your klibc installation is too old or not functional!]) - fi -fi - -AC_SUBST(KLIBC) -])# AC_CHECK_KLIBC - |