diff options
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/icu-layoutex/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch | 224 | ||||
-rw-r--r-- | dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild | 116 | ||||
-rw-r--r-- | dev-libs/icu-le-hb/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild | 37 | ||||
-rw-r--r-- | dev-libs/klibc/Manifest | 3 | ||||
-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 | ||||
-rw-r--r-- | dev-libs/klibc/klibc-2.0.4-r1.ebuild | 311 |
12 files changed, 379 insertions, 536 deletions
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest new file mode 100644 index 00000000..18f5e73c --- /dev/null +++ b/dev-libs/icu-layoutex/Manifest @@ -0,0 +1 @@ +DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37 diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch b/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch new file mode 100644 index 00000000..ef60ce45 --- /dev/null +++ b/dev-libs/icu-layoutex/files/icu-layoutex-58.1-remove-bashisms.patch @@ -0,0 +1,224 @@ +diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in +--- a/config/Makefile.inc.in 2016-09-09 23:28:18.000000000 +0200 ++++ b/config/Makefile.inc.in 2016-11-05 19:43:07.688466668 +0100 +@@ -124,12 +124,6 @@ + # with usually. Many applications will want to add $(ICULIBS_I18N) as well. + ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) + +-# Proper echo newline handling is needed in icu-config +-ECHO_N=@ICU_ECHO_N@ +-ECHO_C=@ICU_ECHO_C@ +-# Not currently being used but good to have for proper tab handling +-ECHO_T=@ICU_ECHO_T@ +- + ################################################################## + ################################################################## + # +diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom +--- a/config/icu-config-bottom 2016-09-09 23:28:18.000000000 +0200 ++++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 +@@ -218,65 +218,65 @@ + ;; + + --cflags) +- echo $ECHO_N "${CFLAGS} ${ECHO_C}" ++ printf "%s" "${CFLAGS} " + ;; + + --cc) +- echo $ECHO_N "${CC} ${ECHO_C}" ++ printf "%s" "${CC} " + ;; + + --cxx) +- echo $ECHO_N "${CXX} ${ECHO_C}" ++ printf "%s" "${CXX} " + ;; + + --cxxflags) +- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" ++ printf "%s" "${CXXFLAGS} " + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. +- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' ++ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) +- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" ++ printf "%s" "-I${prefix}/include " + ;; + + --cppflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCPPFLAGS} " + ;; + + --cxxflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCXXFLAGS} " + ;; + + --cflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCFLAGS} " + ;; + + --ldflags-system) +- echo $ECHO_N "${LIBS} ${ECHO_C}" ++ printf "%s" "${LIBS} " + ;; + + --ldflags) +- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" ++ printf "%s" "${LDFLAGS} ${ICULIBS} " + # $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) +- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" ++ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + ;; + + --ldflags-icuio) +- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_ICUIO} " + ;; + + --ldflags-obsolete) +- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" ++ printf "%s" "${ICULIBS_OBSOLETE} " + ;; + + --ldflags-toolutil) +- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" ++ printf "%s" " ${ICULIBS_TOOLUTIL} " + ;; + + --ldflags-layout) +@@ -285,7 +285,7 @@ + ;; + + --ldflags-searchpath) +- echo $ECHO_N "-L${libdir} ${ECHO_C}" ++ printf "%s" "-L${libdir} " + ;; + + --detect-prefix) +@@ -321,47 +321,47 @@ + ;; + + --shared-datadir) +- echo $ECHO_N "${datadir} ${ECHO_C}" ++ printf "%s" "${datadir} " + ;; + + --incfile) +- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/Makefile.inc " + ;; + + --incpkgdatafile) +- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" ++ printf "%s" "${pkglibdir}/pkgdata.inc " + ;; + + --icudata) +- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" ++ printf "%s" "${ICUDATA_NAME} " + ;; + + --icudata-mode) +- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" ++ printf "%s" "${PKGDATA_MODE} " + ;; + + --icudata-install-dir) +- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUPKGDATA_DIR} " + ;; + + --icudatadir) +- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" ++ printf "%s" "${ICUDATA_DIR} " + ;; + + --shlib-c) +- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" ++ printf "%s" "${SHLIB_c} " + ;; + + --shlib-cc) +- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" ++ printf "%s" "${SHLIB_cc} " + ;; + + --version) +- echo $ECHO_N $VERSION ++ printf "%s" "$VERSION" + ;; + + --unicode-version) +- echo $ECHO_N $UNICODE_VERSION ++ printf "%s" "$UNICODE_VERSION" + ;; + + --host) +diff -ruN a/configure.ac b/configure.ac +--- a/configure.ac 2016-10-04 21:30:20.000000000 +0200 ++++ b/configure.ac 2016-11-05 19:43:07.688466668 +0100 +@@ -22,24 +22,6 @@ + PACKAGE="icu" + AC_SUBST(PACKAGE) + +-# Use custom echo test for newline option +-# Current autoconf (2.65) gives incorrect echo newline option +-# for icu-config +-# This may be removed later - mow (June 17, 2010) +-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T= +-case `/bin/sh -c "echo -n x"` in +--n*) +- case `/bin/sh -c "echo 'x\c'"` in +- *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character. +- *) ICU_ECHO_C='\c';; +- esac;; +-*) +- ICU_ECHO_N='-n';; +-esac +-AC_SUBST(ICU_ECHO_N) +-AC_SUBST(ICU_ECHO_C) +-AC_SUBST(ICU_ECHO_T) +- + AC_MSG_CHECKING(for ICU version numbers) + + # Get the ICU version from uversion.h or other headers +diff -ruN a/icudefs.mk.in b/icudefs.mk.in +--- a/icudefs.mk.in 2016-09-09 23:28:18.000000000 +0200 ++++ b/icudefs.mk.in 2016-11-05 19:43:07.688466668 +0100 +@@ -157,11 +157,6 @@ + ENABLE_STATIC = @ENABLE_STATIC@ + ENABLE_SHARED = @ENABLE_SHARED@ + +-# Echo w/o newline +- +-#ECHO_N = @ICU_ECHO_N@ +-#ECHO_C = @ICU_ECHO_C@ +- + # Commands to compile + COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c + COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c +diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in +--- a/test/hdrtst/Makefile.in 2016-09-28 06:17:24.000000000 +0200 ++++ b/test/hdrtst/Makefile.in 2016-11-05 19:43:07.688466668 +0100 +@@ -35,9 +35,6 @@ + include $(shell icu-config --incfile) + DIRS=$(prefix)/include/unicode + LDIRS=$(prefix)/include/layout +-ECHO_T=@ECHO_T@ +-ECHO_C=@ECHO_C@ +-ECHO_N=@ECHO_N@ + + all: + @echo Please read this Makefile for more information. diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild new file mode 100644 index 00000000..8b79c652 --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal + +DESCRIPTION="External layout part of International Components for Unicode" +HOMEPAGE="http://www.icu-project.org/" +SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" + +LICENSE="BSD" + +SLOT="0/${PV}" + +KEYWORDS="amd64 hppa ia64 ppc ppc64 ~x86" +IUSE="debug static-libs" + +RDEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" + +DEPEND=" + virtual/pkgconfig[${MULTILIB_USEDEP}] + ${RDEPEND} +" + +S="${WORKDIR}/${PN/-layoutex}/source" + +PATCHES=( + "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" +) + +src_prepare() { + # apply patches + default + + local variable + + # Disable renaming as it is stupid thing to do + sed -i \ + -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ + common/unicode/uconfig.h || die + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + eautoreconf +} + +src_configure() { + # Use C++14 + append-cxxflags -std=c++14 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + --disable-samples + --enable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + ECONF_SOURCE=${S} \ + econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + pushd layoutex &>/dev/null || die + emake -j1 VERBOSE="1" check + popd &>/dev/null || die +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest new file mode 100644 index 00000000..14434e0f --- /dev/null +++ b/dev-libs/icu-le-hb/Manifest @@ -0,0 +1 @@ +DIST icu-le-hb-1.0.3.tar.gz 39352 SHA256 1c759ec8ab979bcd2fdf13bf398aa255fa6b8dc002e4232f8187b4b288f91907 SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4 WHIRLPOOL 6cb6341126b1bdc38de6a3c66e9182c2c6cb0bef2bbfe294cbf3f785e942be02201c7afb13df5316fa40f6fbcda4edb845e6827e39942004c43a3a33eaebdbfb diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild new file mode 100644 index 00000000..2f1397b4 --- /dev/null +++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools multilib-minimal + +DESCRIPTION="ICU Layout Engine API on top of HarfBuzz shaping library" +HOMEPAGE="http://www.harfbuzz.org https://github.com/behdad/icu-le-hb" +SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="icu" +SLOT="0" + +KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86" +IUSE="" + +RDEPEND=" + media-libs/harfbuzz:=[${MULTILIB_USEDEP}] +" + +DEPEND=" + ${RDEPEND} + >=dev-libs/icu-58.1[${MULTILIB_USEDEP}] + virtual/pkgconfig[${MULTILIB_USEDEP}] +" + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf +} diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest deleted file mode 100644 index b397f1b7..00000000 --- a/dev-libs/klibc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST klibc-2.0.4.tar.xz 469348 SHA256 7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d WHIRLPOOL f5dc71b48f118155df512d8ac839b66d361b22ff4e040e49a562722d82f18ac83a8c682bf0b4c59a9b108473f74bebc673d38456cf0ab5b1051071ca3fa9b78e -DIST klibc_2.0.2-1.debian.tar.gz 21305 SHA256 93f4b9be5a3c725a38b7ac137850311e3cf8d8094874006c7dce793d2b71e469 SHA512 9cbcc39396a49bc37ace79eaefad6e704ddc9f30aba1b39f40dd2888dad06eeeb7b9c1a387cee60a95cf5641f50bd7f225cf8209547c75a8bae8af4285152d91 WHIRLPOOL a42e148550a27426e8f38b54cb4f3b1f355759d573ab27c0ecadb0c68d0afd54a5950471628ec4e2e27ac9c8b9d841940d6b0f2c0a873d4feab7af37e7989a52 -DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6 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 a5bb9176..00000000 --- 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 94a0caee..00000000 --- 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 cfbc5f63..00000000 --- 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 ---- klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c 2012-10-03 09:41:43.000000000 -0700 -+++ klibc-2.0.2.orig/work/klibc-2.0.2/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 7d253977..00000000 --- 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 38922697..00000000 --- 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 - diff --git a/dev-libs/klibc/klibc-2.0.4-r1.ebuild b/dev-libs/klibc/klibc-2.0.4-r1.ebuild deleted file mode 100644 index 7f4939f3..00000000 --- a/dev-libs/klibc/klibc-2.0.4-r1.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007: -# This still needs major work. -# But it is significently better than the previous version. -# In that it will now build on biarch systems, such as ppc64-32ul. - -# NOTES: -# ====== -# We need to bring in the kernel sources seperately -# Because they have to be configured in a way that differs from the copy in -# /usr/src/. The sys-kernel/linux-headers are too stripped down to use -# unfortunately. -# This will be able to go away once the klibc author updates his code -# to build again the headers provided by the kernel's 'headers_install' target. - -EAPI=5 -K_TARBALL_SUFFIX="xz" - -inherit eutils multilib toolchain-funcs flag-o-matic - -DESCRIPTION="A minimal libc subset for use with initramfs" -HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/" -KV_MAJOR="3" KV_MINOR="x" KV_SUB="18" -PKV_EXTRA="" -if [[ ${PKV_EXTRA} ]]; then - if [[ ${KV_MAJOR} == 2 ]]; then - PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" - else - PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" - fi - PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}" -fi -if [[ ${KV_MAJOR} == 2 ]]; then - OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}" -else - OKV="${KV_MAJOR}.${KV_SUB}" -fi -KERNEL_URI=" - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX} - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}" -DEBIAN_PV=2.0.2 -DEBIAN_PR=1 -DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.gz" -SRC_URI=" - mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX} - mirror://debian/pool/main/k/klibc/${DEBIAN_A} - ${PATCH_URI} - ${KERNEL_URI}" - -LICENSE="|| ( GPL-2 LGPL-2 )" -KEYWORDS="amd64 x86" -SLOT="0" -IUSE="debug test custom-cflags" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" - -KS="${WORKDIR}/linux-${OKV}" - -# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot -QA_EXECSTACK="*" -# Do not strip -RESTRICT="strip" - -kernel_asm_arch() { - a="${1:${ARCH}}" - case ${a} in - # Merged arches - x86) echo i386 ;; # for build on x86 userspace & 64bit kernel - amd64) echo x86 ;; - ppc*) echo powerpc ;; - # Non-merged - alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;; - *) die "TODO: Update the code for your asm-ARCH symlink" ;; - esac -} - -# For a given Gentoo ARCH, -# specify the kernel defconfig most relevant -kernel_defconfig() { - a="${1:${ARCH}}" - # most, but not all arches have a sanely named defconfig - case ${a} in - ppc64) echo ppc64_defconfig ;; - ppc) echo pmac32_defconfig ;; - sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;; - *) echo defconfig ;; - esac -} - -src_unpack() { - unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A} -} - -src_prepare() { - [[ ${PKV} ]] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX} - cd "${S}" - - # Symlink /usr/src/linux to ${S}/linux - ln -snf "${KS}" linux - #ln -snf "/usr" linux - - # Build interp.o with EXTRA_KLIBCAFLAGS (.S source) - epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch - - # Fix usage of -s, bug #201006 - epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch - - # The inline definition from sys/stat.h does not seem to get used - # So just copy it to make this compile for now - epatch "${FILESDIR}"/klibc-2.0.2-mkfifo.patch - - # Newer kernels have some headers in the uapi dir - epatch "${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch -} - -# klibc has it's own ideas of arches -# They reflect userspace strictly. -# This functions maps from a Gentoo ARCH, to an arch that klibc expects -# Look at klibc-${S}/usr/klibc/arch for a list of these arches -klibc_arch() { - a="${1:${ARCH}}" - case ${a} in - amd64) echo x86_64;; - mips) die 'TODO: Use the $ABI' ;; - x86) echo i386;; - *) echo ${a} ;; - esac -} - -src_compile() { - local myargs="all" - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - LD="$(tc-getLD)" - HOSTCC="$(tc-getBUILD_CC)" - HOSTLD="$(tc-getBUILD_LD)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - cd "${KS}" - emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig" - if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \ - [[ "${CHOST/eabi}" != "${CHOST}" ]]; then - # The delete and insert are seperate statements - # so that they are reliably used. - sed -i \ - -e '/CONFIG_AEABI/d' \ - -e '1iCONFIG_AEABI=y' \ - -e '/CONFIG_OABI_COMPAT/d' \ - -e '1iCONFIG_OABI_COMPAT=y' \ - "${KS}"/.config \ - "${S}"/defconfig - fi - emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage" - - cd "${S}" - - use debug && myargs="${myargs} V=1" - use test && myargs="${myargs} test" - append-ldflags -z noexecstack - append-flags -nostdlib - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z noexecstack" \ - HOSTLDFLAGS="-z noexecstack" \ - KLIBCOPTFLAGS='-nostdlib' \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - HOSTLD="${HOSTLD}" LD="${LD}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - T="${T}" \ - $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ - $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ - $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} || die "Compile failed!" - - #SHLIBDIR="/${libdir}" \ - - ARCH="${myARCH}" ABI="${myABI}" -} - -src_install() { - local myargs - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - HOSTCC="$(tc-getBUILD_CC)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - - use debug && myargs="${myargs} V=1" - - local klibc_prefix - if tc-is-cross-compiler ; then - klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix) - else - klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix) - fi - - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z noexecstack" \ - HOSTLDFLAGS="-z noexecstack" \ - KLIBCOPTFLAGS='-nostdlib' \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - HOSTLD="${HOSTLD}" LD="${LD}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - INSTALLROOT="${D}" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - T="${T}" \ - $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ - $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ - $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} \ - install || die "Install failed!" - - #SHLIBDIR="/${libdir}" \ - - # klibc doesn't support prelinking, so we need to mask it - cat > "${T}/70klibc" <<-EOF - PRELINK_PATH_MASK="/usr/${libdir}/klibc" - EOF - - doenvd "${T}"/70klibc - - # Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include - # Actually I have no idea, why the includes have those weird-ass permissions - # on a particular system, might be due to inherited permissions from parent - # directory - find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX - find "${D}"/usr/${libdir}/klibc/include -type f \ - \( -name '.install' -o -name '..install.cmd' \) -delete || die - - # Hardlinks becoming copies - for x in gunzip zcat ; do - rm -f "${D}/${klibc_prefix}/bin/${x}" - dosym gzip "${klibc_prefix}/bin/${x}" - done - - # Restore now, so we can use the tc- functions - ARCH="${myARCH}" ABI="${myABI}" - if ! tc-is-cross-compiler ; then - cd "${S}" - insinto /usr/share/aclocal - doins contrib/klibc.m4 - - dodoc README usr/klibc/CAVEATS - docinto gzip; dodoc usr/gzip/README - fi - - # Fix up the symlink - # Mainly for merged arches - linkname="${D}/usr/${libdir}/klibc/include/asm" - if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then - ln -snf asm-${KLIBCASMARCH} "${linkname}" - fi -} - -src_test() { - if ! tc-is-cross-compiler ; then - cd "${S}"/usr/klibc/tests - ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')" - BROKEN_TESTS="fcntl fnmatch testrand48" - failed=0 - for t in $ALL_TESTS ; do - if has $t $BROKEN_TESTS ; then - echo "=== $t SKIP" - else - echo -n "=== $t " - ./$t </dev/null >/dev/null - rc=$? - if [ $rc -eq 0 ]; then - echo PASS - else - echo FAIL - failed=1 - fi - fi - done - [ $failed -ne 0 ] && die "Some tests failed." - fi -} |