diff --git a/build/jam/PackageRules b/build/jam/PackageRules index c00112251e..6384f16ac1 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -114,7 +114,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture } for feature in $(HAIKU_BUILD_FEATURES) { local featureSplit = [ FSplitString $(feature) : ":" ] ; - defines += HAIKU_BUILD_FEATURE_$(featureSplit:UJ=_)_ENABLED ; + defines += HAIKU_BUILD_FEATURE_$(featureSplit:J=_)_ENABLED ; } local revisionFile = [ DetermineHaikuRevision ] ; diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku deleted file mode 100644 index eadccb7a7f..0000000000 --- a/src/data/package_infos/arm/haiku +++ /dev/null @@ -1,86 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture arm -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~beta1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_ARM_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype -#ifdef HAIKU_BUILD_FEATURE_ARM_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libgcc_s - lib:libicudata - lib:libicui18n - lib:libicuio - lib:libicutest - lib:libicutu - lib:libicuuc - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD - lib:libjpeg - lib:libpng >= 16.0 -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/arm64/haiku b/src/data/package_infos/arm64/haiku deleted file mode 100644 index b631549cf3..0000000000 --- a/src/data/package_infos/arm64/haiku +++ /dev/null @@ -1,86 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture arm64 -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2021 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~beta1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_ARM_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype -#ifdef HAIKU_BUILD_FEATURE_ARM_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libgcc_s - lib:libicudata - lib:libicui18n - lib:libicuio - lib:libicutest - lib:libicutu - lib:libicuuc - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD - lib:libjpeg - lib:libpng >= 16.0 -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/generic/haiku similarity index 53% rename from src/data/package_infos/x86_64/haiku rename to src/data/package_infos/generic/haiku index 15a3babfe8..8483512444 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/generic/haiku @@ -1,6 +1,6 @@ name haiku version %HAIKU_VERSION% -architecture x86_64 +architecture %HAIKU_PACKAGING_ARCH% summary "The Haiku base system" description "The Haiku base system includes all system core software, like @@ -17,7 +17,11 @@ licenses { flags system_package provides { +#ifdef HAIKU_BUILD_FEATURE_x86_64_x86_64_ENABLED haiku=%HAIKU_VERSION% compat>=R1~alpha4_pm_hrev51198 +#else + haiku=%HAIKU_VERSION% compat>=R1~beta1 +#endif cmd:arp cmd:chop cmd:clear @@ -47,6 +51,11 @@ provides { } requires { + noto >= 2.7 +#ifdef HAIKU_REGULAR_BUILD + noto_sans_cjk_jp +#endif + coreutils cmd:sh #ifdef HAIKU_REGULAR_BUILD @@ -55,72 +64,81 @@ requires { cmd:tar cmd:unzip #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBEDIT_ENABLED + + lib:libgcc_s + lib:libstdc++ + lib:libsupc++ + +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libedit_ENABLED lib:libedit #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_FONTCONFIG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_fontconfig_ENABLED lib:libfontconfig #endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_freetype_ENABLED lib:libfreetype - lib:libgcc_s +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_icu_ENABLED lib:libicudata >= 66 lib:libicui18n >= 66 lib:libicuio >= 66 lib:libicutest >= 66 lib:libicutu >= 66 lib:libicuuc >= 66 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ncurses_ENABLED lib:libncurses >= 6.0 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libsolv_ENABLED + lib:libsolv + lib:libsolvext +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED + lib:libz +#endif + #ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED - lib:libexpat -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_GUTENPRINT_ENABLED - lib:libgutenprint >= 8 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBICNS_ENABLED - lib:libicns -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_JASPER_ENABLED - lib:libjasper -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_JPEG_ENABLED - lib:libjpeg -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED - lib:libpng16 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED - lib:libtiff >= 5.6 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED - lib:libwebp -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_OPENEXR_ENABLED - lib:libilmimf_2_4 - lib:libilmimfutil_2_4 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_OPENSSL_ENABLED - lib:libssl - lib:libcrypto -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_FFMPEG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED lib:libavcodec >= 58 lib:libavfilter >= 7 lib:libavformat >= 58 lib:libavutil >= 56 lib:libswresample >= 3 #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64_ZSTD_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_expat_ENABLED + lib:libexpat +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_gutenprint_ENABLED + lib:libgutenprint >= 8 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libicns_ENABLED + lib:libicns +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_openexr_ENABLED + lib:libilmimf_2_4 + lib:libilmimfutil_2_4 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_jasper_ENABLED + lib:libjasper +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_jpeg_ENABLED + lib:libjpeg +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libpng_ENABLED + lib:libpng16 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_openssl_ENABLED + lib:libssl + lib:libcrypto +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_tiff_ENABLED + lib:libtiff >= 5.6 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED + lib:libwebp +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED lib:libzstd >= 1 #endif -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp #endif } diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku deleted file mode 100644 index 7ba9def4c1..0000000000 --- a/src/data/package_infos/m68k/haiku +++ /dev/null @@ -1,77 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture m68k -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~alpha1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_M68K_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype - lib:libfontconfig - lib:libgcc_s -#ifdef HAIKU_REGULAR_BUILD - lib:libjpeg - lib:libpng >= 16.0 -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku deleted file mode 100644 index 76d9b4d182..0000000000 --- a/src/data/package_infos/ppc/haiku +++ /dev/null @@ -1,86 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture ppc -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~alpha1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_PPC_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype -#ifdef HAIKU_BUILD_FEATURE_PPC_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libgcc_s - lib:libicudata - lib:libicui18n - lib:libicuio - lib:libicutest - lib:libicutu - lib:libicuuc - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD - lib:libjpeg - lib:libpng >= 16.0 -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/riscv64/haiku b/src/data/package_infos/riscv64/haiku deleted file mode 100644 index b5dd529277..0000000000 --- a/src/data/package_infos/riscv64/haiku +++ /dev/null @@ -1,126 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture riscv64 -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~beta1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype -#ifdef HAIKU_BUILD_FEATURE_RISCV64_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libgcc_s - lib:libicudata >= 57 - lib:libicui18n >= 57 - lib:libicuio >= 57 - lib:libicutest >= 57 - lib:libicutu >= 57 - lib:libicuuc >= 57 - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_RISCV64_EXPAT_ENABLED - lib:libexpat -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_GUTENPRINT_ENABLED - lib:libgutenprint -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBICNS_ENABLED - lib:libicns -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_JASPER_ENABLED - lib:libjasper -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_JPEG_ENABLED - lib:libjpeg -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBPNG_ENABLED - lib:libpng >= 16.0 -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_TIFF_ENABLED - lib:libtiff >= 5.2 -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBWEBP_ENABLED - lib:libwebp -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_OPENEXR_ENABLED - lib:libilmimf - lib:libilmimfutil -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_OPENSSL_ENABLED - lib:libssl - lib:libcrypto -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_FFMPEG_ENABLED - lib:libavcodec >= 58 - lib:libavfilter >= 7 - lib:libavformat >= 58 - lib:libavutil >= 56 - lib:libswresample >= 3 -#endif -#ifdef HAIKU_BUILD_FEATURE_RISCV64_ZSTD_ENABLED - lib:libzstd >= 1 -#endif -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/sparc/haiku b/src/data/package_infos/sparc/haiku deleted file mode 100644 index 92439e0dc6..0000000000 --- a/src/data/package_infos/sparc/haiku +++ /dev/null @@ -1,126 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture sparc -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~beta1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBEDIT_ENABLED - lib:libedit -#endif - lib:libfreetype -#ifdef HAIKU_BUILD_FEATURE_SPARC_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libgcc_s - lib:libicudata >= 57 - lib:libicui18n >= 57 - lib:libicuio >= 57 - lib:libicutest >= 57 - lib:libicutu >= 57 - lib:libicuuc >= 57 - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_SPARC_EXPAT_ENABLED - lib:libexpat -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_GUTENPRINT_ENABLED - lib:libgutenprint >= 8 -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBICNS_ENABLED - lib:libicns -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_JASPER_ENABLED - lib:libjasper -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_JPEG_ENABLED - lib:libjpeg -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBPNG_ENABLED - lib:libpng >= 16.0 -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_TIFF_ENABLED - lib:libtiff >= 5.2 -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBWEBP_ENABLED - lib:libwebp -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_OPENEXR_ENABLED - lib:libilmimf - lib:libilmimfutil -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_OPENSSL_ENABLED - lib:libssl >= 1.0.0 - lib:libcrypto >= 1.0.0 -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_FFMPEG_ENABLED - lib:libavcodec >= 58 - lib:libavfilter >= 7 - lib:libavformat >= 58 - lib:libavutil >= 56 - lib:libswresample >= 3 -#endif -#ifdef HAIKU_BUILD_FEATURE_SPARC_ZSTD_ENABLED - lib:libzstd >= 1 -#endif -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku deleted file mode 100644 index 3649d60dc2..0000000000 --- a/src/data/package_infos/x86/haiku +++ /dev/null @@ -1,128 +0,0 @@ -name haiku -version %HAIKU_VERSION% -architecture x86 -summary "The Haiku base system" - -description "The Haiku base system includes all system core software, like -boot loader, kernel, the system libraries, servers, and applications." - -packager "The Haiku build system" -vendor "Haiku Project" - -copyrights "2001-2020 Haiku, Inc. et al" -licenses { - MIT - "GNU LGPL v2.1" -} -flags system_package - -provides { - haiku=%HAIKU_VERSION% compat>=R1~alpha1 - cmd:arp - cmd:chop - cmd:clear - cmd:df - cmd:ftpd - cmd:hd - cmd:hey - cmd:login - cmd:more - cmd:passwd - cmd:ping - cmd:ping6 - cmd:prio - cmd:ps - cmd:renice - cmd:resattr - cmd:su - cmd:telnet - cmd:telnetd - cmd:top - cmd:traceroute - cmd:trash - cmd:unchop - cmd:useradd - cmd:watch - cmd:xres -} - -requires { - coreutils - cmd:sh -#ifdef HAIKU_REGULAR_BUILD - cmd:bunzip2 - cmd:gunzip - cmd:tar - cmd:unzip -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_LIBEDIT_ENABLED - lib:libedit -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_FONTCONFIG_ENABLED - lib:libfontconfig -#endif - lib:libfreetype - lib:libgcc_s - lib:libicudata >= 57 - lib:libicui18n >= 57 - lib:libicuio >= 57 - lib:libicutest >= 57 - lib:libicutu >= 57 - lib:libicuuc >= 57 - lib:libncurses >= 6.0 -#ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_X86_EXPAT_ENABLED - lib:libexpat -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GUTENPRINT_ENABLED - lib:libgutenprint >= 8 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_LIBICNS_ENABLED - lib:libicns -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_JASPER_ENABLED - lib:libjasper -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_JPEG_ENABLED - lib:libjpeg -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED - lib:libpng >= 16.0 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED - lib:libtiff >= 5.2 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED - lib:libwebp -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_OPENEXR_ENABLED - lib:libilmimf - lib:libilmimfutil -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_OPENSSL_ENABLED - lib:libssl - lib:libcrypto -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_FFMPEG_ENABLED - lib:libavcodec >= 58 - lib:libavfilter >= 7 - lib:libavformat >= 58 - lib:libavresample >= 4 - lib:libavutil >= 56 - lib:libswscale >= 5 - lib:libswresample >= 3 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_ZSTD_ENABLED - lib:libzstd >= 1 -#endif -#endif - lib:libsolv - lib:libsolvext - lib:libstdc++ - lib:libsupc++ - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp -#endif -} diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 22a6144c6d..fa9970259b 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -48,6 +48,11 @@ provides { } requires { + noto >= 2.7 +#ifdef HAIKU_REGULAR_BUILD + noto_sans_cjk_jp +#endif + coreutils cmd:sh #ifdef HAIKU_REGULAR_BUILD @@ -56,69 +61,77 @@ requires { cmd:tar cmd:unzip #endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBEDIT_ENABLED + +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libedit_ENABLED lib:libedit #endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FONTCONFIG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_fontconfig_ENABLED lib:libfontconfig #endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_freetype_ENABLED lib:libfreetype +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_icu_ENABLED lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ncurses_ENABLED lib:libncurses >= 6.0 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libsolv_ENABLED + lib:libsolv + lib:libsolvext +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED + lib:libz +#endif + #ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_EXPAT_ENABLED - lib:libexpat -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_GUTENPRINT_ENABLED - lib:libgutenprint >= 8 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBICNS_ENABLED - lib:libicns -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JASPER_ENABLED - lib:libjasper -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JPEG_ENABLED - lib:libjpeg -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED - lib:libpng16 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED - lib:libtiff >= 5.6 -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED - lib:libwebp -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_OPENEXR_ENABLED - lib:libilmimf - lib:libilmimfutil -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_OPENSSL_ENABLED - lib:libssl - lib:libcrypto -#endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FFMPEG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED lib:libavcodec >= 58 lib:libavfilter >= 7 lib:libavformat >= 58 lib:libavutil >= 56 lib:libswresample >= 3 #endif -#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_ZSTD_ENABLED +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_expat_ENABLED + lib:libexpat +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_gutenprint_ENABLED + lib:libgutenprint >= 8 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libicns_ENABLED + lib:libicns +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_openexr_ENABLED + lib:libilmimf + lib:libilmimfutil +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_jasper_ENABLED + lib:libjasper +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_jpeg_ENABLED + lib:libjpeg +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libpng_ENABLED + lib:libpng16 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_openssl_ENABLED + lib:libssl + lib:libcrypto +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_tiff_ENABLED + lib:libtiff >= 5.6 +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED + lib:libwebp +#endif +#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED lib:libzstd >= 1 #endif -#endif - lib:libsolv - lib:libsolvext - lib:libz - noto >= 2.7 -#ifdef HAIKU_REGULAR_BUILD - noto_sans_cjk_jp #endif }