wok-next diff glibc/receipt @ rev 21020
Cleaning is almost finished... I should proceed to upgrades.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Nov 02 14:15:08 2018 +0200 (2018-11-02) |
parents | a429b73c2d89 |
children | d03cdb2a688a |
line diff
1.1 --- a/glibc/receipt Tue Feb 27 14:06:41 2018 +0200 1.2 +++ b/glibc/receipt Fri Nov 02 14:15:08 2018 +0200 1.3 @@ -4,7 +4,7 @@ 1.4 VERSION="2.26" 1.5 CATEGORY="meta" 1.6 SHORT_DESC="The GNU C libraries" 1.7 -MAINTAINER="pankso@slitaz.org" 1.8 +MAINTAINER="devel@slitaz.org" 1.9 LICENSE="GPL2" 1.10 WEB_SITE="http://www.gnu.org/software/libc/" 1.11 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/glibc.html" 1.12 @@ -12,25 +12,14 @@ 1.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.14 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 1.15 1.16 -BUILD_DEPENDS="linux-api-headers autoconf bash gawk gettext bison texinfo" 1.17 +BUILD_DEPENDS="linux-api-headers autoconf bash gawk gettext-dev bison texinfo" 1.18 # slitaz-i18n should present in wok 1.19 -SPLIT="glibc-base glibc-locale nscd glibc-dev" 1.20 +SPLIT="$PACKAGE-base $PACKAGE-locale nscd $PACKAGE-dev" 1.21 1.22 # Locales include to glibc-base package by default, other locales are in: locale-** and glibc-locale 1.23 DEFAULT_LOCALE="en_US en_GB" 1.24 1.25 -# Handle multiarch compilation. 1.26 -case "$ARCH" in 1.27 - arm*) VERSION="2.13";; 1.28 -esac 1.29 - 1.30 -# Handle multiarch installation. 1.31 -case "$SLITAZ_ARCH" in 1.32 - arm*) VERSION="2.13";; 1.33 -esac 1.34 - 1.35 - 1.36 -# Rules to compile & install the temporary toolchain. 1.37 +# Compile & install the temporary toolchain. 1.38 cook_tmp_toolchain() { 1.39 unset CFLAGS CXXFLAGS 1.40 case $ARCH in 1.41 @@ -65,7 +54,6 @@ 1.42 unset SPECS 1.43 } 1.44 1.45 -# Rules to configure and make the package. 1.46 compile_rules() { 1.47 # Glibc needs ld.so.conf in the install destdir. 1.48 mkdir -p $install/etc 1.49 @@ -159,15 +147,6 @@ 1.50 TAGS="LFS" 1.51 ;; 1.52 glibc-base) 1.53 - case "$ARCH" in 1.54 - arm*) 1.55 - # Eglibc is cross compiled by cross to have a toolchain so we can 1.56 - # use these files instead of recooking it. ARM use Eglibc 1.57 - echo "Using cross compiled Eglibc..." 1.58 - install="/cross/$ARCH/sysroot" 1.59 - copy libc_nonshared.a libpthread_nonshared.a 1.60 - ;; 1.61 - esac 1.62 copy \ 1.63 ld-*.so* ld.so* \ 1.64 libanl-*.so* libanl.so* \