wok-next rev 20616
xrdp: up 0.9.3.1; zopfli: fix build; gcc61: attempt to fix; add gcc6 (latest among 6.x.x).
gcc61 and gcc6 are broken now.
gcc61 and gcc6 are broken now.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Apr 21 05:15:11 2018 +0300 (2018-04-21) |
| parents | 0222c6257a8d |
| children | 1f8d622f0165 |
| files | gcc6/receipt gcc6/stuff/patches/gcc-6.4.0.patch gcc6/stuff/patches/series gcc61/receipt gcc61/stuff/patches/gcc-6.1.0.patch gcc61/stuff/patches/series xrdp/receipt zopfli/receipt |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/gcc6/receipt Sat Apr 21 05:15:11 2018 +0300 1.3 @@ -0,0 +1,105 @@ 1.4 +# SliTaz package receipt v2. 1.5 + 1.6 +PACKAGE="gcc6" 1.7 +VERSION="6.4.0" 1.8 +CATEGORY="development" 1.9 +SHORT_DESC="The GNU Compiler Collection" 1.10 +MAINTAINER="pankso@slitaz.org" 1.11 +LICENSE="GPL2" 1.12 +WEB_SITE="http://gcc.gnu.org/" 1.13 + 1.14 +TARBALL="gcc-$VERSION.tar.xz" 1.15 +WGET_URL="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$TARBALL" 1.16 + 1.17 +# We need gawk since busybox awk is not sufficient. We have BUILD_DEPENDS 1.18 +# for cookutils that are not used by tazwok/cook-toolchain since it installs 1.19 +# and uses its own copy. 1.20 +BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev" 1.21 +SPLIT="gcc6-lib-base" 1.22 + 1.23 +compile_rules() { 1.24 + case $ARCH in 1.25 + arm*) 1.26 + ARCH_ARGS="--with-tune=armv6" 1.27 + ;; 1.28 + i?86) 1.29 + ARCH_ARGS="--with-tune=$ARCH" 1.30 + export CFLAGS="-march=i486 -Os -pipe" 1.31 + export CXXFLAGS="$CFLAGS" 1.32 + ;; 1.33 + x86_64) 1.34 + ARCH_ARGS="--with-tune=nocona" 1.35 + export CFLAGS="-march=nocona -Os -pipe" 1.36 + export CXXFLAGS="$CFLAGS" 1.37 + ;; 1.38 + esac 1.39 + 1.40 + echo "CFLAGS : $CFLAGS" 1.41 + echo "LDFLAGS : $LDFLAGS" 1.42 + 1.43 + pkgversion="SliTaz" 1.44 + languages="c,c++" 1.45 + 1.46 + # Use libiberty.a from binutils. 1.47 + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in || return 1 1.48 + 1.49 + sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in 1.50 + 1.51 + mkdir -p ../gcc-build && cd ../gcc-build 1.52 + 1.53 + $src/configure \ 1.54 + --libexecdir=/usr/lib \ 1.55 + --enable-nls \ 1.56 + --enable-languages=${languages} \ 1.57 + --enable-shared \ 1.58 + --with-system-zlib \ 1.59 + --enable-clocale=gnu \ 1.60 + --enable-objc-gc \ 1.61 + --enable-__cxa_atexit \ 1.62 + --enable-lto \ 1.63 + --enable-threads=posix \ 1.64 + --disable-bootstrap \ 1.65 + --program-suffix=-6 \ 1.66 + --libdir=/usr/libgcc6 \ 1.67 + --with-pkgversion="$pkgversion" \ 1.68 + --disable-multilib \ 1.69 + $ARCH_ARGS \ 1.70 + $CONFIGURE_ARGS && 1.71 + make && make install 1.72 +} 1.73 + 1.74 +genpkg_rules() { 1.75 + case $PACKAGE in 1.76 + gcc6) 1.77 + mkdir -p $fs/usr/share 1.78 + cp -a $install/usr/bin $fs/usr 1.79 + 1.80 + # Copy all libs. Do not hide gcc-lib-base. 1.81 + cp -a $install/usr/lib* $fs/usr 1.82 + 1.83 + # Include files. 1.84 + cp -a $install/usr/include $fs/usr 1.85 + 1.86 + # Remove build directory. 1.87 + rm -rf $WOK/$PACKAGE/source/$PACKAGE-build 1.88 + rm -rf $WOK/$PACKAGE/$PACKAGE-build 1.89 + DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils" 1.90 + TAGS="compiler C C++" 1.91 + ;; 1.92 + gcc6-lib-base) 1.93 + mkdir -p $fs/usr/lib 1.94 + cp -a $install/usr/libgcc61/libgcc_s.so* $fs/usr/lib 1.95 + cp -a $install/usr/libgcc61/libstdc++.so* $fs/usr/lib 1.96 + rm -f $fs/usr/lib/*-gdb.py 1.97 + CAT="development|base libraries, libgcc_s and libstdc++" 1.98 + PROVIDE="gcc-lib-base" 1.99 + ;; 1.100 + esac 1.101 +} 1.102 + 1.103 +post_remove_gcc61_lib_base() { 1.104 + cd "$1/usr/lib" 1.105 + ln -s libstdc++.so.6.*.* libstdc++.so.6 1.106 + ln -s libstdc++.so.6.*.* libstdc++.so 1.107 + cd - >/dev/null 1.108 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/gcc6/stuff/patches/gcc-6.4.0.patch Sat Apr 21 05:15:11 2018 +0300 2.3 @@ -0,0 +1,16 @@ 2.4 +./md-unwind-support.h: In function 'x86_64_fallback_frame_state': 2.5 +./md-unwind-support.h:65:47: error: dereferencing pointer to incomplete type 'struct ucontext' 2.6 + sc = (struct sigcontext *) (void *) &uc_->uc_mcontext; 2.7 + ^~ 2.8 + 2.9 +--- a/libgcc/config/i386/linux-unwind.h 2.10 ++++ b/libgcc/config/i386/linux-unwind.h 2.11 +@@ -58,7 +58,7 @@ 2.12 + if (*(unsigned char *)(pc+0) == 0x48 2.13 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) 2.14 + { 2.15 +- struct ucontext *uc_ = context->cfa; 2.16 ++ struct ucontext_t *uc_ = context->cfa; 2.17 + /* The void * cast is necessary to avoid an aliasing warning. 2.18 + The aliasing warning is correct, but should not be a problem 2.19 + because it does not alias anything. */
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gcc6/stuff/patches/series Sat Apr 21 05:15:11 2018 +0300 3.3 @@ -0,0 +1,1 @@ 3.4 +gcc-6.4.0.patch
4.1 --- a/gcc61/receipt Fri Apr 20 14:55:15 2018 +0300 4.2 +++ b/gcc61/receipt Sat Apr 21 05:15:11 2018 +0300 4.3 @@ -19,11 +19,24 @@ 4.4 4.5 compile_rules() { 4.6 case $ARCH in 4.7 - arm*) ARCH_ARGS="--with-tune=armv6";; 4.8 - i?86) ARCH_ARGS="--with-tune=$ARCH";; 4.9 - x86_64) ARCH_ARGS="--with-tune=nocona";; 4.10 + arm*) 4.11 + ARCH_ARGS="--with-tune=armv6" 4.12 + ;; 4.13 + i?86) 4.14 + ARCH_ARGS="--with-tune=$ARCH" 4.15 + export CFLAGS="-march=i486 -Os -pipe" 4.16 + export CXXFLAGS="$CFLAGS" 4.17 + ;; 4.18 + x86_64) 4.19 + ARCH_ARGS="--with-tune=nocona" 4.20 + export CFLAGS="-march=nocona -Os -pipe" 4.21 + export CXXFLAGS="$CFLAGS" 4.22 + ;; 4.23 esac 4.24 4.25 + echo "CFLAGS : $CFLAGS" 4.26 + echo "LDFLAGS : $LDFLAGS" 4.27 + 4.28 pkgversion="SliTaz" 4.29 languages="c,c++" 4.30
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/gcc61/stuff/patches/gcc-6.1.0.patch Sat Apr 21 05:15:11 2018 +0300 5.3 @@ -0,0 +1,29 @@ 5.4 +${src}/gcc/ubsan.c:1473:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] 5.5 + 5.6 +--- a/gcc/ubsan.c 5.7 ++++ b/gcc/ubsan.c 5.8 +@@ -1470,7 +1470,7 @@ 5.9 + 5.10 + expanded_location xloc = expand_location (loc); 5.11 + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 5.12 +- || xloc.file == '\0' || xloc.file[0] == '\xff' 5.13 ++ || *xloc.file == '\0' || xloc.file[0] == '\xff' 5.14 + || xloc.file[1] == '\xff') 5.15 + return false; 5.16 + 5.17 +./md-unwind-support.h: In function 'x86_64_fallback_frame_state': 5.18 +./md-unwind-support.h:65:47: error: dereferencing pointer to incomplete type 'struct ucontext' 5.19 + sc = (struct sigcontext *) (void *) &uc_->uc_mcontext; 5.20 + ^~ 5.21 + 5.22 +--- a/libgcc/config/i386/linux-unwind.h 5.23 ++++ b/libgcc/config/i386/linux-unwind.h 5.24 +@@ -58,7 +58,7 @@ 5.25 + if (*(unsigned char *)(pc+0) == 0x48 5.26 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) 5.27 + { 5.28 +- struct ucontext *uc_ = context->cfa; 5.29 ++ struct ucontext_t *uc_ = context->cfa; 5.30 + /* The void * cast is necessary to avoid an aliasing warning. 5.31 + The aliasing warning is correct, but should not be a problem 5.32 + because it does not alias anything. */
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/gcc61/stuff/patches/series Sat Apr 21 05:15:11 2018 +0300 6.3 @@ -0,0 +1,1 @@ 6.4 +gcc-6.1.0.patch
7.1 --- a/xrdp/receipt Fri Apr 20 14:55:15 2018 +0300 7.2 +++ b/xrdp/receipt Sat Apr 21 05:15:11 2018 +0300 7.3 @@ -1,20 +1,20 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="xrdp" 7.7 -VERSION="0.6.1" 7.8 +VERSION="0.9.3.1" 7.9 CATEGORY="network" 7.10 -SHORT_DESC="An open source remote desktop protocol(rdp) server" 7.11 +SHORT_DESC="An open source remote desktop protocol (RDP) server" 7.12 MAINTAINER="pascal.bellard@slitaz.org" 7.13 LICENSE="GPL2" 7.14 WEB_SITE="http://www.xrdp.org/" 7.15 7.16 -TARBALL="$PACKAGE-v$VERSION.tar.gz" 7.17 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 7.18 +TARBALL="$PACKAGE-$VERSION.tar.gz" 7.19 +WGET_URL="https://github.com/neutrinolabs/xrdp/releases/download/v$VERSION/$TARBALL" 7.20 7.21 -BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev" 7.22 +BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev nasm" 7.23 +SPLIT="xrdp-dev" 7.24 7.25 compile_rules() { 7.26 - ./bootstrap && 7.27 ./configure $CONFIGURE_ARGS && 7.28 fix libtool && 7.29 make && 7.30 @@ -32,7 +32,14 @@ 7.31 } 7.32 7.33 genpkg_rules() { 7.34 - copy @std 7.35 - DEPENDS="openssl zlib xorg-libX11 xorg-libXfixes xorg-libxcb xorg-libXau \ 7.36 - xorg-libXdmcp pam tightvnc" 7.37 + case $PACKAGE in 7.38 + xrdp) 7.39 + copy @std 7.40 + DEPENDS="openssl pam xorg-libX11 xorg-libXfixes xorg-libXrandr \ 7.41 + tightvnc" 7.42 + ;; 7.43 + *-dev) 7.44 + copy @dev 7.45 + ;; 7.46 + esac 7.47 }
8.1 --- a/zopfli/receipt Fri Apr 20 14:55:15 2018 +0300 8.2 +++ b/zopfli/receipt Sat Apr 21 05:15:11 2018 +0300 8.3 @@ -1,28 +1,27 @@ 8.4 -# SliTaz package receipt. 8.5 +# SliTaz package receipt v2. 8.6 8.7 PACKAGE="zopfli" 8.8 VERSION="1.0.1" 8.9 CATEGORY="base-system" 8.10 -SHORT_DESC="A good, but slow, deflate or zlib compressor." 8.11 +SHORT_DESC="A good, but slow, deflate or zlib compressor" 8.12 MAINTAINER="pascal.bellard@slitaz.org" 8.13 LICENSE="Apache" 8.14 +WEB_SITE="https://github.com/google/zopfli" 8.15 + 8.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 8.17 -WEB_SITE="https://github.com/google/zopfli" 8.18 WGET_URL="$WEB_SITE/archive/$TARBALL" 8.19 -TAGS="compression" 8.20 8.21 -DEPENDS="gcc-lib-base" 8.22 +compile_rules() { 8.23 + make zopfli 8.24 + make zopflipng 8.25 +# make libzopfli 8.26 +# make libzopflipng 8.27 8.28 -# Rules to configure and make the package. 8.29 -compile_rules() 8.30 -{ 8.31 - make zopflipng zopfli libzopfli 8.32 + install -Dm755 zopfli $install/usr/bin/zopfli 8.33 + install -Dm755 zopflipng $install/usr/bin/zopflipng 8.34 } 8.35 8.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.37 -genpkg_rules() 8.38 -{ 8.39 - mkdir -p $fs/usr/bin 8.40 - cp -a $src/zopfli $fs/usr/bin 8.41 - cp -a $src/zopflipng $fs/usr/bin 8.42 +genpkg_rules() { 8.43 + copy @std 8.44 + TAGS="compression" 8.45 }