wok-next rev 20445
gcc: fix symlink /lib/cpp; glibc: undo '--enable-obsolete-rpc' due to errors; libtirpc: up 1.0.2; pam and busybox: use libtirpc.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Feb 27 14:06:41 2018 +0200 (2018-02-27) |
| parents | 6c73b944e8dd |
| children | bce36a298f1e |
| files | busybox/receipt busybox/stuff/.config busybox/stuff/.config-ssfs busybox/stuff/.config-static gcc/receipt glibc/receipt libtirpc-dev/receipt libtirpc/receipt pam/receipt |
line diff
1.1 --- a/busybox/receipt Mon Feb 26 04:46:49 2018 +0200 1.2 +++ b/busybox/receipt Tue Feb 27 14:06:41 2018 +0200 1.3 @@ -16,7 +16,8 @@ 1.4 case "$ARCH" in 1.5 arm*) SPLIT='';; 1.6 x86_64) SPLIT="busybox busybox-pam:pam";; 1.7 - *) SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs busybox-boot:boot busybox-static:static";; 1.8 + *) SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs" # busybox-boot:boot busybox-static:static 1.9 + ;; 1.10 esac 1.11 1.12 compile_rules() { 1.13 @@ -31,15 +32,13 @@ 1.14 ;; 1.15 esac 1.16 1.17 -alias ar=/usr/bin/ar 1.18 - 1.19 # Next both for i?86 and x86_64 native compilation 1.20 case "$SET" in 1.21 '') 1.22 cp $stuff/.config $src 1.23 make oldconfig && 1.24 - make AR=/usr/bin/ar && 1.25 - make AR=/usr/bin/ar install || return 1 1.26 + make && 1.27 + make install || return 1 1.28 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \ 1.29 $src/_install/bin/busybox 1.30 1.31 @@ -92,7 +91,7 @@ 1.32 pam) 1.33 sed 's|# CONFIG_PAM is not set|CONFIG_PAM=y|' $stuff/.config > $src/.config 1.34 make oldconfig && 1.35 - make AR=/usr/bin/ar || return 1 1.36 + make || return 1 1.37 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr busybox 1.38 1.39 # mv docs/busybox.1 docs/busybox.pam.1 1.40 @@ -151,7 +150,7 @@ 1.41 sed -i 's|uclibc-i486-||; 1.42 s|CFLAGS="|&-D_BSD_SOURCE |; 1.43 s|LDFLAGS="|&-Wl,--allow-multiple-definition |; 1.44 - s|LDLIBS="|&compat rpc |' $src/.config 1.45 + s|LDLIBS="|&compat tirpc |' $src/.config 1.46 make oldconfig && 1.47 make CC="/usr/lib/diet/bin/diet gcc" || return 1 1.48 mv busybox busybox-diet 1.49 @@ -163,7 +162,7 @@ 1.50 1.51 # Cross compilation check. 1.52 testsuite() { 1.53 - readelf -h $install/bin/busybox 1.54 + readelf -h $WOK/busybox/install/bin/busybox 1.55 } 1.56 1.57 # Rules to gen a SliTaz package suitable for Tazpkg. 1.58 @@ -171,14 +170,14 @@ 1.59 case $PACKAGE in 1.60 busybox) 1.61 copy @std *.mo 1.62 - DEPENDS="slitaz-base-files glibc-base ncurses" 1.63 + DEPENDS="slitaz-base-files glibc-base ncurses libtirpc" 1.64 CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \ 1.65 /etc/resolv.conf /etc/httpd.conf" 1.66 ;; 1.67 busybox-pam) 1.68 copy @std 1.69 CAT="base-system|with PAM support" 1.70 - DEPENDS="busybox pam" 1.71 + DEPENDS="busybox libtirpc pam" 1.72 CONFIG_FILES="/etc/pam.d" 1.73 PROVIDE="busybox:pam" 1.74 ;;
2.1 --- a/busybox/stuff/.config Mon Feb 26 04:46:49 2018 +0200 2.2 +++ b/busybox/stuff/.config Tue Feb 27 14:06:41 2018 +0200 2.3 @@ -51,7 +51,7 @@ 2.4 CONFIG_SYSROOT="" 2.5 CONFIG_EXTRA_CFLAGS="" 2.6 CONFIG_EXTRA_LDFLAGS="" 2.7 -CONFIG_EXTRA_LDLIBS="" 2.8 +CONFIG_EXTRA_LDLIBS="tirpc" 2.9 2.10 # 2.11 # Installation Options ("make install" behavior)
3.1 --- a/busybox/stuff/.config-ssfs Mon Feb 26 04:46:49 2018 +0200 3.2 +++ b/busybox/stuff/.config-ssfs Tue Feb 27 14:06:41 2018 +0200 3.3 @@ -51,7 +51,7 @@ 3.4 CONFIG_SYSROOT="" 3.5 CONFIG_EXTRA_CFLAGS="" 3.6 CONFIG_EXTRA_LDFLAGS="" 3.7 -CONFIG_EXTRA_LDLIBS="" 3.8 +CONFIG_EXTRA_LDLIBS="tirpc" 3.9 3.10 # 3.11 # Installation Options ("make install" behavior)
4.1 --- a/busybox/stuff/.config-static Mon Feb 26 04:46:49 2018 +0200 4.2 +++ b/busybox/stuff/.config-static Tue Feb 27 14:06:41 2018 +0200 4.3 @@ -50,7 +50,7 @@ 4.4 CONFIG_SYSROOT="" 4.5 CONFIG_EXTRA_CFLAGS="" 4.6 CONFIG_EXTRA_LDFLAGS="" 4.7 -CONFIG_EXTRA_LDLIBS="" 4.8 +CONFIG_EXTRA_LDLIBS="tirpc" 4.9 4.10 # 4.11 # Installation Options ("make install" behavior)
5.1 --- a/gcc/receipt Mon Feb 26 04:46:49 2018 +0200 5.2 +++ b/gcc/receipt Tue Feb 27 14:06:41 2018 +0200 5.3 @@ -88,8 +88,11 @@ 5.4 esac && 5.5 make && make install || return 1 5.6 5.7 + mkdir -p $install/lib 5.8 ln -sv ../usr/bin/cpp $install/lib 5.9 + 5.10 ln -sv gcc $install/usr/bin/cc 5.11 + 5.12 install -v -dm755 $install/usr/lib/bfd-plugins 5.13 ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/$VERSION/liblto_plugin.so \ 5.14 $install/usr/lib/bfd-plugins/ 5.15 @@ -180,8 +183,3 @@ 5.16 ;; 5.17 esac 5.18 } 5.19 - 5.20 -post_install_gcc() { 5.21 - [ -f "$1/lib/cpp" ] || ln -s ../usr/bin/cpp "$1/lib" 5.22 - [ -f "$1/usr/bin/cc" ] || ln -s gcc "$1/usr/bin/cc" 5.23 -}
6.1 --- a/glibc/receipt Mon Feb 26 04:46:49 2018 +0200 6.2 +++ b/glibc/receipt Tue Feb 27 14:06:41 2018 +0200 6.3 @@ -89,13 +89,11 @@ 6.4 # put the exact or lower numbers. From Glibc INSTALL: 6.5 # > The higher the VERSION number is, the less compatibility code is 6.6 # > added, and the faster the code gets. 6.7 - # --enable-obsolete-rpc: Busybox (and maybe something else too) require it 6.8 CC="gcc $ARCH_ARGS -isystem /usr/lib/gcc/$BUILD_SYSTEM/$(. $WOK/gcc/receipt; echo $VERSION)/include \ 6.9 -isystem /usr/include" \ 6.10 ../configure \ 6.11 --disable-werror \ 6.12 --enable-kernel=3.2 \ 6.13 - --enable-obsolete-rpc \ 6.14 --enable-stack-protector=strong \ 6.15 libc_cv_slibdir=/lib \ 6.16 $CONFIGURE_ARGS &&
7.1 --- a/libtirpc-dev/receipt Mon Feb 26 04:46:49 2018 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,20 +0,0 @@ 7.4 -# SliTaz package receipt. 7.5 - 7.6 -PACKAGE="libtirpc-dev" 7.7 -VERSION="0.2.1" 7.8 -CATEGORY="development" 7.9 -SHORT_DESC="Transport-Independent RPC library, development files." 7.10 -MAINTAINER="pascal.bellard@slitaz.org" 7.11 -LICENSE="BSD" 7.12 -WEB_SITE="http://libtirpc.sourceforge.net/" 7.13 -WANTED="libtirpc" 7.14 -HOST_ARCH="i486 arm" 7.15 - 7.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.17 -genpkg_rules() 7.18 -{ 7.19 - mkdir -p $fs/usr/lib 7.20 - cp -a $install/usr/lib/*a $fs/usr/lib 7.21 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 7.22 - cp -a $install/usr/include $fs/usr 7.23 -}
8.1 --- a/libtirpc/receipt Mon Feb 26 04:46:49 2018 +0200 8.2 +++ b/libtirpc/receipt Tue Feb 27 14:06:41 2018 +0200 8.3 @@ -1,27 +1,41 @@ 8.4 -# SliTaz package receipt. 8.5 +# SliTaz package receipt v2. 8.6 8.7 PACKAGE="libtirpc" 8.8 -VERSION="0.2.1" 8.9 +VERSION="1.0.2" 8.10 CATEGORY="system-tools" 8.11 -SHORT_DESC="Transport-Independent RPC library." 8.12 +SHORT_DESC="Transport-Independent RPC library" 8.13 MAINTAINER="pascal.bellard@slitaz.org" 8.14 LICENSE="BSD" 8.15 +WEB_SITE="http://libtirpc.sourceforge.net/" 8.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libtirpc.html" 8.17 + 8.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 8.19 -WEB_SITE="http://libtirpc.sourceforge.net/" 8.20 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 8.21 -HOST_ARCH="i486 arm" 8.22 8.23 -# Rules to configure and make the package. 8.24 -compile_rules() 8.25 -{ 8.26 - ./configure $CONFIGURE_ARGS && 8.27 - make && make install 8.28 +SPLIT="libtirpc-dev" 8.29 + 8.30 +compile_rules() { 8.31 + # Fix a build issue with glibc-2.26: 8.32 + sed -i '/stdlib.h/a#include <stdint.h>' src/xdr_sizeof.c 8.33 + 8.34 + # Fix a symbol name needed by NIS libraries: 8.35 + sed -i '/key_secret_is/s|secret|secretkey|' src/libtirpc.map 8.36 + 8.37 + ./configure \ 8.38 + --sysconfdir=/etc \ 8.39 + --disable-static \ 8.40 + --disable-gssapi \ 8.41 + $CONFIGURE_ARGS && 8.42 + make && make install || return 1 8.43 + 8.44 + mkdir -p $install/lib 8.45 + mv -v $install/usr/lib/libtirpc.so.* $install/lib 8.46 + ln -sfv ../../lib/$(readlink $install/lib/libtirpc.so.3) $install/usr/lib/libtirpc.so 8.47 } 8.48 8.49 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.50 -genpkg_rules() 8.51 -{ 8.52 - mkdir -p $fs/usr/lib 8.53 - cp -a $install/usr/lib/*.so* $fs/usr/lib 8.54 - cp -a $install/etc $fs 8.55 +genpkg_rules() { 8.56 + case $PACKAGE in 8.57 + libtirpc) copy @std;; 8.58 + *-dev) copy @dev;; 8.59 + esac 8.60 }
9.1 --- a/pam/receipt Mon Feb 26 04:46:49 2018 +0200 9.2 +++ b/pam/receipt Tue Feb 27 14:06:41 2018 +0200 9.3 @@ -12,7 +12,7 @@ 9.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 9.5 WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2" 9.6 9.7 -BUILD_DEPENDS="db-dev" # gettext" 9.8 +BUILD_DEPENDS="db-dev libtirpc-dev gettext" 9.9 SPLIT="pam-dev" 9.10 9.11 compile_rules() { 9.12 @@ -23,15 +23,15 @@ 9.13 --enable-securedir=/lib/security \ 9.14 --docdir=/usr/share/doc/Linux-PAM-$VERSION \ 9.15 $CONFIGURE_ARGS && 9.16 - make && make install && 9.17 + make && make install || return 1 9.18 9.19 - mkdir -p $install/etc/pam.d && 9.20 - cp $stuff/other $install/etc/pam.d && 9.21 + mkdir -p $install/etc/pam.d 9.22 + cp $stuff/other $install/etc/pam.d 9.23 9.24 - chmod -v 4755 $install/sbin/unix_chkpwd && 9.25 + chmod -v 4755 $install/sbin/unix_chkpwd 9.26 9.27 for file in pam pam_misc pamc; do 9.28 - mv -v $install/usr/lib/lib$file.so.* $install/lib && 9.29 + mv -v $install/usr/lib/lib$file.so.* $install/lib 9.30 ln -sfv ../../lib/$(readlink $install/usr/lib/lib$file.so) \ 9.31 $install/usr/lib/lib$file.so 9.32 done 9.33 @@ -39,8 +39,8 @@ 9.34 9.35 genpkg_rules() { 9.36 case $PACKAGE in 9.37 - pam) copy @std; DEPENDS="libdb";; 9.38 - *-dev) copy @dev; DEPENDS="pam db-dev";; 9.39 + pam) copy @std; DEPENDS="libdb libtirpc";; 9.40 + *-dev) copy @dev; DEPENDS="pam db-dev libtirpc-dev";; 9.41 esac 9.42 } 9.43