# HG changeset patch # User Aleksej Bobylev # Date 1519733201 -7200 # Node ID a429b73c2d895393f82f956ada6d8d2cc0dcbb9a # Parent 6c73b944e8dd51bb385e741fc031783624b9cb6c gcc: fix symlink /lib/cpp; glibc: undo '--enable-obsolete-rpc' due to errors; libtirpc: up 1.0.2; pam and busybox: use libtirpc. diff -r 6c73b944e8dd -r a429b73c2d89 busybox/receipt --- a/busybox/receipt Mon Feb 26 04:46:49 2018 +0200 +++ b/busybox/receipt Tue Feb 27 14:06:41 2018 +0200 @@ -16,7 +16,8 @@ case "$ARCH" in arm*) SPLIT='';; x86_64) SPLIT="busybox busybox-pam:pam";; - *) SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs busybox-boot:boot busybox-static:static";; + *) SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs" # busybox-boot:boot busybox-static:static + ;; esac compile_rules() { @@ -31,15 +32,13 @@ ;; esac -alias ar=/usr/bin/ar - # Next both for i?86 and x86_64 native compilation case "$SET" in '') cp $stuff/.config $src make oldconfig && - make AR=/usr/bin/ar && - make AR=/usr/bin/ar install || return 1 + make && + make install || return 1 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \ $src/_install/bin/busybox @@ -92,7 +91,7 @@ pam) sed 's|# CONFIG_PAM is not set|CONFIG_PAM=y|' $stuff/.config > $src/.config make oldconfig && - make AR=/usr/bin/ar || return 1 + make || return 1 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr busybox # mv docs/busybox.1 docs/busybox.pam.1 @@ -151,7 +150,7 @@ sed -i 's|uclibc-i486-||; s|CFLAGS="|&-D_BSD_SOURCE |; s|LDFLAGS="|&-Wl,--allow-multiple-definition |; - s|LDLIBS="|&compat rpc |' $src/.config + s|LDLIBS="|&compat tirpc |' $src/.config make oldconfig && make CC="/usr/lib/diet/bin/diet gcc" || return 1 mv busybox busybox-diet @@ -163,7 +162,7 @@ # Cross compilation check. testsuite() { - readelf -h $install/bin/busybox + readelf -h $WOK/busybox/install/bin/busybox } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -171,14 +170,14 @@ case $PACKAGE in busybox) copy @std *.mo - DEPENDS="slitaz-base-files glibc-base ncurses" + DEPENDS="slitaz-base-files glibc-base ncurses libtirpc" CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \ /etc/resolv.conf /etc/httpd.conf" ;; busybox-pam) copy @std CAT="base-system|with PAM support" - DEPENDS="busybox pam" + DEPENDS="busybox libtirpc pam" CONFIG_FILES="/etc/pam.d" PROVIDE="busybox:pam" ;; diff -r 6c73b944e8dd -r a429b73c2d89 busybox/stuff/.config --- a/busybox/stuff/.config Mon Feb 26 04:46:49 2018 +0200 +++ b/busybox/stuff/.config Tue Feb 27 14:06:41 2018 +0200 @@ -51,7 +51,7 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" +CONFIG_EXTRA_LDLIBS="tirpc" # # Installation Options ("make install" behavior) diff -r 6c73b944e8dd -r a429b73c2d89 busybox/stuff/.config-ssfs --- a/busybox/stuff/.config-ssfs Mon Feb 26 04:46:49 2018 +0200 +++ b/busybox/stuff/.config-ssfs Tue Feb 27 14:06:41 2018 +0200 @@ -51,7 +51,7 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" +CONFIG_EXTRA_LDLIBS="tirpc" # # Installation Options ("make install" behavior) diff -r 6c73b944e8dd -r a429b73c2d89 busybox/stuff/.config-static --- a/busybox/stuff/.config-static Mon Feb 26 04:46:49 2018 +0200 +++ b/busybox/stuff/.config-static Tue Feb 27 14:06:41 2018 +0200 @@ -50,7 +50,7 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" +CONFIG_EXTRA_LDLIBS="tirpc" # # Installation Options ("make install" behavior) diff -r 6c73b944e8dd -r a429b73c2d89 gcc/receipt --- a/gcc/receipt Mon Feb 26 04:46:49 2018 +0200 +++ b/gcc/receipt Tue Feb 27 14:06:41 2018 +0200 @@ -88,8 +88,11 @@ esac && make && make install || return 1 + mkdir -p $install/lib ln -sv ../usr/bin/cpp $install/lib + ln -sv gcc $install/usr/bin/cc + install -v -dm755 $install/usr/lib/bfd-plugins ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/$VERSION/liblto_plugin.so \ $install/usr/lib/bfd-plugins/ @@ -180,8 +183,3 @@ ;; esac } - -post_install_gcc() { - [ -f "$1/lib/cpp" ] || ln -s ../usr/bin/cpp "$1/lib" - [ -f "$1/usr/bin/cc" ] || ln -s gcc "$1/usr/bin/cc" -} diff -r 6c73b944e8dd -r a429b73c2d89 glibc/receipt --- a/glibc/receipt Mon Feb 26 04:46:49 2018 +0200 +++ b/glibc/receipt Tue Feb 27 14:06:41 2018 +0200 @@ -89,13 +89,11 @@ # put the exact or lower numbers. From Glibc INSTALL: # > The higher the VERSION number is, the less compatibility code is # > added, and the faster the code gets. - # --enable-obsolete-rpc: Busybox (and maybe something else too) require it CC="gcc $ARCH_ARGS -isystem /usr/lib/gcc/$BUILD_SYSTEM/$(. $WOK/gcc/receipt; echo $VERSION)/include \ -isystem /usr/include" \ ../configure \ --disable-werror \ --enable-kernel=3.2 \ - --enable-obsolete-rpc \ --enable-stack-protector=strong \ libc_cv_slibdir=/lib \ $CONFIGURE_ARGS && diff -r 6c73b944e8dd -r a429b73c2d89 libtirpc-dev/receipt --- a/libtirpc-dev/receipt Mon Feb 26 04:46:49 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="libtirpc-dev" -VERSION="0.2.1" -CATEGORY="development" -SHORT_DESC="Transport-Independent RPC library, development files." -MAINTAINER="pascal.bellard@slitaz.org" -LICENSE="BSD" -WEB_SITE="http://libtirpc.sourceforge.net/" -WANTED="libtirpc" -HOST_ARCH="i486 arm" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/include $fs/usr -} diff -r 6c73b944e8dd -r a429b73c2d89 libtirpc/receipt --- a/libtirpc/receipt Mon Feb 26 04:46:49 2018 +0200 +++ b/libtirpc/receipt Tue Feb 27 14:06:41 2018 +0200 @@ -1,27 +1,41 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="libtirpc" -VERSION="0.2.1" +VERSION="1.0.2" CATEGORY="system-tools" -SHORT_DESC="Transport-Independent RPC library." +SHORT_DESC="Transport-Independent RPC library" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" +WEB_SITE="http://libtirpc.sourceforge.net/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libtirpc.html" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://libtirpc.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -HOST_ARCH="i486 arm" -# Rules to configure and make the package. -compile_rules() -{ - ./configure $CONFIGURE_ARGS && - make && make install +SPLIT="libtirpc-dev" + +compile_rules() { + # Fix a build issue with glibc-2.26: + sed -i '/stdlib.h/a#include ' src/xdr_sizeof.c + + # Fix a symbol name needed by NIS libraries: + sed -i '/key_secret_is/s|secret|secretkey|' src/libtirpc.map + + ./configure \ + --sysconfdir=/etc \ + --disable-static \ + --disable-gssapi \ + $CONFIGURE_ARGS && + make && make install || return 1 + + mkdir -p $install/lib + mv -v $install/usr/lib/libtirpc.so.* $install/lib + ln -sfv ../../lib/$(readlink $install/lib/libtirpc.so.3) $install/usr/lib/libtirpc.so } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/etc $fs +genpkg_rules() { + case $PACKAGE in + libtirpc) copy @std;; + *-dev) copy @dev;; + esac } diff -r 6c73b944e8dd -r a429b73c2d89 pam/receipt --- a/pam/receipt Mon Feb 26 04:46:49 2018 +0200 +++ b/pam/receipt Tue Feb 27 14:06:41 2018 +0200 @@ -12,7 +12,7 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2" -BUILD_DEPENDS="db-dev" # gettext" +BUILD_DEPENDS="db-dev libtirpc-dev gettext" SPLIT="pam-dev" compile_rules() { @@ -23,15 +23,15 @@ --enable-securedir=/lib/security \ --docdir=/usr/share/doc/Linux-PAM-$VERSION \ $CONFIGURE_ARGS && - make && make install && + make && make install || return 1 - mkdir -p $install/etc/pam.d && - cp $stuff/other $install/etc/pam.d && + mkdir -p $install/etc/pam.d + cp $stuff/other $install/etc/pam.d - chmod -v 4755 $install/sbin/unix_chkpwd && + chmod -v 4755 $install/sbin/unix_chkpwd for file in pam pam_misc pamc; do - mv -v $install/usr/lib/lib$file.so.* $install/lib && + mv -v $install/usr/lib/lib$file.so.* $install/lib ln -sfv ../../lib/$(readlink $install/usr/lib/lib$file.so) \ $install/usr/lib/lib$file.so done @@ -39,8 +39,8 @@ genpkg_rules() { case $PACKAGE in - pam) copy @std; DEPENDS="libdb";; - *-dev) copy @dev; DEPENDS="pam db-dev";; + pam) copy @std; DEPENDS="libdb libtirpc";; + *-dev) copy @dev; DEPENDS="pam db-dev libtirpc-dev";; esac }