wok-undigest rev 1225
copied recipes from wok-next
| author | Hans-G?nter Theisgen |
|---|---|
| date | Fri Nov 15 17:42:43 2019 +0100 (2019-11-15) |
| parents | 5ccc69eb9042 |
| children | f987b2a37476 |
| files | libx11/.icon.png libx11/receipt meson/.icon.png meson/description.txt meson/receipt meson/stuff/meson-wrapper ninja/receipt ninja/stuff/patches/ninja-1.8.2-add_NINJAJOBS_var-1.patch ninja/stuff/patches/series |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/libx11/.icon.png Fri Nov 15 17:42:43 2019 +0100 1.3 @@ -0,0 +1,1 @@ 1.4 +../xorg/.icon.png 1.5 \ No newline at end of file
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/libx11/receipt Fri Nov 15 17:42:43 2019 +0100 2.3 @@ -0,0 +1,40 @@ 2.4 +# SliTaz package receipt v2. 2.5 + 2.6 +PACKAGE="libx11" 2.7 +VERSION="1.6.7" 2.8 +CATEGORY="x-window" 2.9 +SHORT_DESC="X11 Client library" 2.10 +MAINTAINER="devel@slitaz.org" 2.11 +LICENSE="MIT" 2.12 +WEB_SITE="https://www.x.org/wiki/" 2.13 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html" 2.14 + 2.15 +TARBALL="libX11-$VERSION.tar.bz2" 2.16 +WGET_URL="$XORG_MIRROR/lib/$TARBALL" 2.17 +TARBALL_SHA1="5076f7853713d7db958a05f6fd1c18f7e111a0ad" 2.18 + 2.19 +BUILD_DEPENDS="xtrans libxcb-dev xorgproto libxau-dev libxdmcp-dev perl" 2.20 +SPLIT="$PACKAGE-dev" 2.21 + 2.22 +COPY_std="*.so* XErrorDB Xcms.txt compose.dir locale.alias locale.dir \ 2.23 +C/ en_US.UTF-8/" # split -> locale-* packages 2.24 + 2.25 +DEPENDS_std="libxcb" 2.26 +DEPENDS_dev="$PACKAGE xorgproto libxcb-dev" 2.27 + 2.28 +compile_rules() { 2.29 + ./configure \ 2.30 + --disable-static \ 2.31 + $CONFIGURE_ARGS && 2.32 + fix libtool && 2.33 + make && 2.34 + make install 2.35 + 2.36 + # strip whitespace - reduce size 2.37 + find $install -name Compose -exec sed -i 's|\t| |g; s| *| |g; /^$/d' '{}' \+ 2.38 +} 2.39 + 2.40 +TAGS="Xorg" 2.41 + 2.42 +PROVIDE_std="xorg-libX11" 2.43 +PROVIDE_dev="xorg-libX11-dev"
3.1 Binary file meson/.icon.png has changed
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/meson/description.txt Fri Nov 15 17:42:43 2019 +0100 4.3 @@ -0,0 +1,4 @@ 4.4 +Meson is a cross-platform build system designed to be both as fast and as user 4.5 +friendly as possible. It supports many languages and compilers, including GCC, 4.6 +Clang and Visual Studio. Its build definitions are written in a simple 4.7 +non-turing complete DSL.
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/meson/receipt Fri Nov 15 17:42:43 2019 +0100 5.3 @@ -0,0 +1,25 @@ 5.4 +# SliTaz package receipt v2. 5.5 + 5.6 +PACKAGE="meson" 5.7 +VERSION="0.49.0" 5.8 +CATEGORY="development" 5.9 +SHORT_DESC="A high performance build system" 5.10 +MAINTAINER="al.bobylev@gmail.com" 5.11 +LICENSE="Apache" 5.12 +WEB_SITE="https://mesonbuild.com/" 5.13 +LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/meson.html" 5.14 +HOST_ARCH="any" 5.15 + 5.16 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.17 +WGET_URL="https://github.com/mesonbuild/meson/releases/download/$VERSION/$TARBALL" 5.18 + 5.19 +BUILD_DEPENDS="python3" 5.20 +DEPENDS_std="python3" 5.21 + 5.22 +TAGS_std="LFS" 5.23 + 5.24 +compile_rules() { 5.25 + python3 -B setup.py install --root=$install || return 1 5.26 + 5.27 + install -m755 $stuff/meson-wrapper $install/usr/bin/ 5.28 +}
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/meson/stuff/meson-wrapper Fri Nov 15 17:42:43 2019 +0100 6.3 @@ -0,0 +1,21 @@ 6.4 +#!/bin/sh -ex 6.5 +# Meson wrapper for SliTaz Linux packaging 6.6 + 6.7 +exec meson setup \ 6.8 + --prefix /usr \ 6.9 + --libdir /usr/lib \ 6.10 + --libexecdir /usr/lib \ 6.11 + --bindir /usr/bin \ 6.12 + --sbindir /usr/bin \ 6.13 + --includedir /usr/include \ 6.14 + --datadir /usr/share \ 6.15 + --mandir /usr/share/man \ 6.16 + --infodir /usr/share/info \ 6.17 + --localedir /usr/share/locale \ 6.18 + --sysconfdir /etc \ 6.19 + --localstatedir /var \ 6.20 + --sharedstatedir /var/lib \ 6.21 + --buildtype release \ 6.22 + --wrap-mode nofallback \ 6.23 + "$@" \ 6.24 + -D b_lto=true
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/ninja/receipt Fri Nov 15 17:42:43 2019 +0100 7.3 @@ -0,0 +1,31 @@ 7.4 +# SliTaz package receipt v2. 7.5 + 7.6 +PACKAGE="ninja" 7.7 +VERSION="1.8.2" 7.8 +CATEGORY="development" 7.9 +SHORT_DESC="Small build system with a focus on speed" 7.10 +MAINTAINER="al.bobylev@gmail.com" 7.11 +LICENSE="Apache" 7.12 +WEB_SITE="https://ninja-build.org/" 7.13 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/ninja.html" 7.14 + 7.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 7.16 +WGET_URL="https://github.com/ninja-build/ninja/archive/v$VERSION/$TARBALL" 7.17 + 7.18 +BUILD_DEPENDS="python" 7.19 + 7.20 +compile_rules() { 7.21 + export NINJAJOBS=4 # Should be OK for our 6x Intel(R) Xeon(R) CPU W3530 @ 2.8GHz 7.22 + 7.23 + python configure.py --bootstrap || return 1 7.24 + 7.25 + install -Dm755 ninja $install/usr/bin/ninja 7.26 + install -Dm644 misc/bash-completion $install/usr/share/bash-completion/completions/ninja 7.27 + install -Dm644 misc/zsh-completion $install/usr/share/zsh/site-functions/_ninja 7.28 + cook_pick_docs doc/manual.asciidoc 7.29 +} 7.30 + 7.31 +genpkg_rules() { 7.32 + copy /usr/bin/ninja 7.33 + TAGS="LFS" 7.34 +}
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/ninja/stuff/patches/ninja-1.8.2-add_NINJAJOBS_var-1.patch Fri Nov 15 17:42:43 2019 +0100 8.3 @@ -0,0 +1,65 @@ 8.4 +Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org> 8.5 +Date: 2017-10-14 8.6 +Initial Package Version: 1.9.2 8.7 +Upstream Status: Not submitted 8.8 +Origin: Self 8.9 +Description: Ninja normally uses all cores+2 when building 8.10 + a package. This patch allows useers to limit the 8.11 + cores used by setting an environment variable: 8.12 + NINJAJOBS to an integer. 8.13 + 8.14 + The patch also fixes a few warnings. 8.15 + 8.16 + 8.17 +diff -Naur ninja-1.8.2.orig/src/build_log.cc ninja-1.8.2/src/build_log.cc 8.18 +--- ninja-1.8.2.orig/src/build_log.cc 2017-09-10 20:20:10.000000000 -0500 8.19 ++++ ninja-1.8.2/src/build_log.cc 2017-10-12 14:38:00.988957823 -0500 8.20 +@@ -75,12 +75,12 @@ 8.21 + } 8.22 + switch (len & 7) 8.23 + { 8.24 +- case 7: h ^= uint64_t(data[6]) << 48; 8.25 +- case 6: h ^= uint64_t(data[5]) << 40; 8.26 +- case 5: h ^= uint64_t(data[4]) << 32; 8.27 +- case 4: h ^= uint64_t(data[3]) << 24; 8.28 +- case 3: h ^= uint64_t(data[2]) << 16; 8.29 +- case 2: h ^= uint64_t(data[1]) << 8; 8.30 ++ case 7: h ^= uint64_t(data[6]) << 48; __attribute__ ((fallthrough)); 8.31 ++ case 6: h ^= uint64_t(data[5]) << 40; __attribute__ ((fallthrough)); 8.32 ++ case 5: h ^= uint64_t(data[4]) << 32; __attribute__ ((fallthrough)); 8.33 ++ case 4: h ^= uint64_t(data[3]) << 24; __attribute__ ((fallthrough)); 8.34 ++ case 3: h ^= uint64_t(data[2]) << 16; __attribute__ ((fallthrough)); 8.35 ++ case 2: h ^= uint64_t(data[1]) << 8; __attribute__ ((fallthrough)); 8.36 + case 1: h ^= uint64_t(data[0]); 8.37 + h *= m; 8.38 + }; 8.39 +diff -Naur ninja-1.8.2.orig/src/hash_map.h ninja-1.8.2/src/hash_map.h 8.40 +--- ninja-1.8.2.orig/src/hash_map.h 2017-09-10 20:20:10.000000000 -0500 8.41 ++++ ninja-1.8.2/src/hash_map.h 2017-10-12 14:30:29.563974429 -0500 8.42 +@@ -39,8 +39,8 @@ 8.43 + len -= 4; 8.44 + } 8.45 + switch (len) { 8.46 +- case 3: h ^= data[2] << 16; 8.47 +- case 2: h ^= data[1] << 8; 8.48 ++ case 3: h ^= data[2] << 16; __attribute__ ((fallthrough)); 8.49 ++ case 2: h ^= data[1] << 8; __attribute__ ((fallthrough)); 8.50 + case 1: h ^= data[0]; 8.51 + h *= m; 8.52 + }; 8.53 +diff -Naur ninja-1.8.2.orig/src/ninja.cc ninja-1.8.2/src/ninja.cc 8.54 +--- ninja-1.8.2.orig/src/ninja.cc 2017-09-10 20:20:10.000000000 -0500 8.55 ++++ ninja-1.8.2/src/ninja.cc 2017-10-12 14:47:34.143936739 -0500 8.56 +@@ -221,6 +221,12 @@ 8.57 + 8.58 + /// Choose a default value for the -j (parallelism) flag. 8.59 + int GuessParallelism() { 8.60 ++ 8.61 ++ int j = 0; 8.62 ++ char* jobs = getenv( "NINJAJOBS" ); 8.63 ++ if ( jobs != NULL ) j = atoi( jobs ); 8.64 ++ if ( j > 0 ) return j; 8.65 ++ 8.66 + switch (int processors = GetProcessorCount()) { 8.67 + case 0: 8.68 + case 1: