wok-current rev 25591
Use default gcc 6.3 for cmake, icu, efivar, efibootmgr
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Tue Aug 29 09:02:18 2023 +0000 (16 months ago) |
parents | ac34e9209f8e |
children | 58294245c63d |
files | cmake/receipt efibootmgr/receipt efivar/receipt icu-dev/receipt icu/receipt memtest/receipt |
line diff
1.1 --- a/cmake/receipt Thu Aug 24 14:03:59 2023 +0000 1.2 +++ b/cmake/receipt Tue Aug 29 09:02:18 2023 +0000 1.3 @@ -11,8 +11,8 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.5 WGET_URL="https://www.cmake.org/files/v${VERSION%.*}/$TARBALL" 1.6 1.7 -DEPENDS="gcc83-lib-base libidn openssl" 1.8 -BUILD_DEPENDS="gcc83 gcc83-lib-base ncurses-dev openssl-dev" 1.9 +DEPENDS="libidn openssl" 1.10 +BUILD_DEPENDS="ncurses-dev openssl-dev" 1.11 1.12 # What is the latest version available today? 1.13 current_version() 1.14 @@ -24,8 +24,6 @@ 1.15 # Rules to configure and make the package. 1.16 compile_rules() 1.17 { 1.18 - export CXX=g++-83 1.19 - 1.20 ./bootstrap \ 1.21 --prefix=/usr \ 1.22 --docdir=/share/doc/$PACKAGE \
2.1 --- a/efibootmgr/receipt Thu Aug 24 14:03:59 2023 +0000 2.2 +++ b/efibootmgr/receipt Tue Aug 29 09:02:18 2023 +0000 2.3 @@ -11,8 +11,8 @@ 2.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.5 WGET_URL="https://github.com/rhboot/efibootmgr/archive/$VERSION.tar.gz" 2.6 2.7 -DEPENDS="efivar gcc83-lib-base popt" 2.8 -BUILD_DEPENDS="efivar-dev gcc83 icu-dev popt-dev" 2.9 +DEPENDS="efivar popt" 2.10 +BUILD_DEPENDS="efivar-dev icu-dev popt-dev" 2.11 2.12 current_version() 2.13 { 2.14 @@ -26,8 +26,6 @@ 2.15 patch --strip=1 --input=$stuff/patches/efibootmgr.c-17 && 2.16 2.17 export EFIDIR=/boot/efi 2.18 - export CC=gcc-83 2.19 - export COMPILER=gcc-83 2.20 export CFLAGS="$CFLAGS -I/usr/include/unicode -I/usr/include/efivar" 2.21 2.22 make libdir=/usr/lib &&
3.1 --- a/efivar/receipt Thu Aug 24 14:03:59 2023 +0000 3.2 +++ b/efivar/receipt Tue Aug 29 09:02:18 2023 +0000 3.3 @@ -11,8 +11,7 @@ 3.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.5 WGET_URL="$WEB_SITE/archive/$VERSION/$TARBALL" 3.6 3.7 -DEPENDS="gcc83-lib-base" 3.8 -BUILD_DEPENDS="gcc83 icu-dev" 3.9 +BUILD_DEPENDS="icu-dev" 3.10 3.11 current_version() 3.12 { 3.13 @@ -23,8 +22,6 @@ 3.14 # Rules to configure and make the package. 3.15 compile_rules() 3.16 { 3.17 - export CC_FOR_BUILD=gcc-83 3.18 - export COMPILER=gcc-83 3.19 export CFLAGS="$CFLAGS -I/usr/include/unicode" 3.20 3.21 # replace char16_t by wchar_t:
4.1 --- a/icu-dev/receipt Thu Aug 24 14:03:59 2023 +0000 4.2 +++ b/icu-dev/receipt Tue Aug 29 09:02:18 2023 +0000 4.3 @@ -8,7 +8,7 @@ 4.4 LICENSE="MIT" 4.5 WEB_SITE="https://icu.unicode.org/" 4.6 4.7 -DEPENDS="gcc83-lib-base icu pkg-config" 4.8 +DEPENDS="icu pkg-config" 4.9 WANTED="icu" 4.10 4.11 # Rules to gen a SliTaz package suitable for Tazpkg.
5.1 --- a/icu/receipt Thu Aug 24 14:03:59 2023 +0000 5.2 +++ b/icu/receipt Tue Aug 29 09:02:18 2023 +0000 5.3 @@ -18,9 +18,6 @@ 5.4 sed '/ is now available/!d;s| is now available.*||;s|ICU ||;q' 5.5 } 5.6 5.7 -DEPENDS="gcc83-lib-base" 5.8 -BUILD_DEPENDS="gcc83" 5.9 - 5.10 # Rules to configure and make the package. 5.11 compile_rules() 5.12 { 5.13 @@ -28,8 +25,6 @@ 5.14 #sed -i 's/dirname -- /dirname/' configure 5.15 #{ 5.16 ./configure \ 5.17 - CC=gcc-83 \ 5.18 - CXX=g++-83 \ 5.19 --disable-samples \ 5.20 --disable-tests \ 5.21 --enable-auto-cleanup \
6.1 --- a/memtest/receipt Thu Aug 24 14:03:59 2023 +0000 6.2 +++ b/memtest/receipt Tue Aug 29 09:02:18 2023 +0000 6.3 @@ -11,7 +11,7 @@ 6.4 WEB_SITE="https://www.memtest.org/" 6.5 WGET_URL="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v$VERSION.tar.gz" 6.6 6.7 -BUILD_DEPENDS="xz lz4 lzsa gcc83" 6.8 +BUILD_DEPENDS="xz lz4 lzsa" 6.9 6.10 # What is the latest version available today? 6.11 current_version() 6.12 @@ -67,7 +67,7 @@ 6.13 compile_rules() 6.14 { 6.15 sed -i 's|64, MT_VERSION "." GIT_HASH|65, MT_VERSION ".SliTaz"|;s|"\.x32"|".386"|' app/display.c 6.16 - sed 's|gcc|gcc-83|;s|march=i586|march=i486|' -i build32/Makefile 6.17 + sed 's|march=i586|march=i486|' -i build32/Makefile 6.18 patch -p0 < $stuff/memtest86\+-6-386.patch 6.19 cd build32 6.20 make boot/startup.o