Browse Source

misc/klibc: Updated for version 2.0.9.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
pull/182/head
M.Dinslage 4 years ago
committed by Robby Workman
parent
commit
7522fd9bba
  1. 77
      misc/klibc/klibc-2.0.3-kernel-uapi.patch
  2. 16
      misc/klibc/klibc.SlackBuild
  3. 10
      misc/klibc/klibc.info

77
misc/klibc/klibc-2.0.3-kernel-uapi.patch

@ -1,77 +0,0 @@
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

16
misc/klibc/klibc.SlackBuild

@ -2,7 +2,7 @@
# Slackware build script for klibc
# Copyright 2014 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=klibc
VERSION=${VERSION:-2.0.4}
VERSION=${VERSION:-2.0.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -86,12 +86,14 @@ if [ $ARCH = "x86_64" ]; then
sed -i 's,$(prefix)/lib,$(prefix)/lib64,g' Makefile
fi
# Patch for building with newer kernels.
# Thanks to the gentoo team for the patch.
patch -p1 < $CWD/klibc-2.0.3-kernel-uapi.patch
mkdir -p uapi/include
ln -sf /usr/include/{asm,asm-generic,linux} uapi/include/
env -u ARCH KLIBCKERNELSRC=/lib/modules/$KERNEL/source HOSTCFLAGS="$SLKCFLAGS" make
env -u ARCH KLIBCKERNELSRC=/lib/modules/$KERNEL/source make install INSTALLROOT=$PKG
make KLIBCKERNELSRC=uapi
make KLIBCKERNELSRC=uapi install INSTALLROOT=$PKG
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

10
misc/klibc/klibc.info

@ -1,10 +1,10 @@
PRGNAM="klibc"
VERSION="2.0.4"
VERSION="2.0.9"
HOMEPAGE="https://www.kernel.org"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
DOWNLOAD_x86_64="https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz"
MD5SUM_x86_64="7417eeabb2e7954f58a34fba87646ddc"
DOWNLOAD="https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-2.0.9.tar.xz"
MD5SUM="7554a9759ae71e9ba3729991c8ae7f63"
DOWNLOAD_x86_64=
MD5SUM_x86_64=
REQUIRES=""
MAINTAINER="M.Dinslage"
EMAIL="daedra1980{at}gmail{dot}com"
Loading…
Cancel
Save