i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update build packages repository

Browse Source 
- Switch to Python3
- Switch to mawk instead of gawk
- Update ffmpeg (there are several new dependencies)
- Update ICU
- Fix various pre-existing problems with packages not being properly
  declared for gcc2 (but somehow it ended up working)
- remove curl, subversion, mercurial

Confirmed that both nightly and release images are building fine on both
32 and 64bit. However, non-x86 architecture may require re-bootstrapping
to do a complete nightly or release image build (the minimal profile
should be fine)

Fixes #16751.

Change-Id: Iacac92923c4113b3e0a49a64b0b4cc1b8e2f5e2e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3871
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Adrien Destugues
2021-05-14 14:59:19 +00:00
committed by Adrien Destugues
parent f203aee66c
commit 3b3bcbf7aa
13 changed files with 340 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+12 -9
View File
@@ -20,25 +20,28 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Include required packages: # Include required packages:
# primary architecture # primary architecture
AddHaikuImageSystemPackages [ FFilterByBuildFeatures AddHaikuImageSystemPackages [ FFilterByBuildFeatures
bash bc coreutils curl freetype icu libsolv zlib zstd bash bc coreutils freetype libsolv zlib
!gcc2 @{ icu66 }@
gcc2 @{ icu icu66_x86@secondary_x86 }@
regular_image @{ regular_image @{
bzip2 diffutils expat ffmpeg findutils gawk glu grep gutenprint8 bzip2 diffutils expat ffmpeg findutils glu gutenprint8 gzip
gzip
lame less libedit libicns lame less libedit libicns
mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2 mawk mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
netcat netcat
sed sharutils sed sharutils
tar tcpdump unzip wget which zip tcpdump unzip wget which zip
!gcc2 @{ grep tar zstd }@
gcc2 @{ grep_x86@secondary_x86 tar_x86@secondary_x86 }@
}@ }@
] ; ] ;
AddHaikuImageSourcePackages [ FFilterByBuildFeatures AddHaikuImageSourcePackages [ FFilterByBuildFeatures
bash bc coreutils bash bc coreutils
regular_image @{ regular_image @{
expat ffmpeg findutils gawk grep gutenprint8 expat ffmpeg findutils grep gutenprint8 gzip
gzip lame less libicns mawk
lame less libicns
sed sharutils sed sharutils
tar wget which tar wget which
}@ }@
@@ -54,7 +57,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] { in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures AddHaikuImageSystemPackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib freetype icu libsolv zlib
regular_image @{ regular_image @{
ffmpeg glu jasper jpeg libicns libpng16 libwebp mesa ffmpeg glu jasper jpeg libicns libpng16 libwebp mesa
ReadMe.Compiling.md
+1 -1
View File
@@ -31,7 +31,7 @@ nightly builds.
* `makeinfo` (part of `texinfo`, only needed for building GCC 4) * `makeinfo` (part of `texinfo`, only needed for building GCC 4)
* `autoheader` (part of `autoconf`, needed for building GCC) * `autoheader` (part of `autoconf`, needed for building GCC)
* `automake` (needed for building GCC) * `automake` (needed for building GCC)
* `gawk` * `awk` (GNU awk is most tested, but other implementations should work)
* `nasm` * `nasm`
* `wget` * `wget`
* `[un]zip` * `[un]zip`
build/jam/DefaultBuildProfiles
+16 -17
View File
@@ -83,22 +83,20 @@ rule DefineDefaultBuildProfiles
bepdf bepdf
keymapswitcher keymapswitcher
mandoc mandoc
nano
noto noto
noto_sans_cjk_jp noto_sans_cjk_jp
openssh openssh
p7zip
pdfwriter pdfwriter
pe pe
python
timgmsoundfont timgmsoundfont
vision vision
wpa_supplicant wpa_supplicant
wqy_microhei wqy_microhei
# xz_utils can't be built with gcc2, so we install it for # Some packages can't be built with gcc2, so we install the gcc8
# primary gcc 8 architectures or gcc 2 hybrids. # secondary architecture package instead in this case
xz_utils@!gcc2 !gcc2 @{ nano p7zip python3 xz_utils }@
gcc2 @{ xz_utils_x86@secondary_x86 }@ gcc2 @{ nano_x86@secondary_x86 p7zip_x86@secondary_x86
python3_x86@secondary_x86 xz_utils_x86@secondary_x86 }@
; ;
AddHaikuImageSourcePackages AddHaikuImageSourcePackages
bepdf bepdf
@@ -137,18 +135,20 @@ rule DefineDefaultBuildProfiles
AddHaikuImageSystemPackages AddHaikuImageSystemPackages
mandoc mandoc
nano
noto noto
openssh openssh
openssl openssl
p7zip
pe pe
vision vision
wpa_supplicant wpa_supplicant
# xz_utils can't be built with gcc2, so we install it for # xz_utils can't be built with gcc2, so we install it for
# primary gcc 4 architectures or gcc 2 hybrids. # primary gcc 8 architectures or gcc 2 hybrids.
xz_utils@!gcc2 !gcc2 @{ nano p7zip xz_utils }@
gcc2 @{ xz_utils_x86@secondary_x86 }@ gcc2 @{
nano_x86@secondary_x86
p7zip_x86@secondary_x86
xz_utils_x86@secondary_x86
}@
; ;
AddHaikuImageSourcePackages AddHaikuImageSourcePackages
nano nano
@@ -187,7 +187,6 @@ rule DefineDefaultBuildProfiles
bison bison
expat expat
flex flex
gawk
gcc gcc
grep grep
haikuporter haikuporter
@@ -195,15 +194,17 @@ rule DefineDefaultBuildProfiles
libedit libedit
m4 m4
make make
mawk
ncurses6 ncurses6
noto noto
python python
sed sed
texinfo texinfo
!gcc2 @{ grep }@
gcc2 @{ grep_x86@secondary_x86 }@
; ;
AddHaikuImageDisabledPackages AddHaikuImageDisabledPackages
curl_devel
freetype_devel freetype_devel
libedit_devel libedit_devel
ncurses6_devel ncurses6_devel
@@ -217,18 +218,16 @@ rule DefineDefaultBuildProfiles
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageSystemPackages AddHaikuImageSystemPackages
binutils binutils
curl
expat expat
freetype freetype
gcc gcc
icu icu@gcc2 icu66@!gcc2
libsolv libsolv
libedit libedit
ncurses6 ncurses6
zlib zlib
; ;
AddHaikuImageDisabledPackages AddHaikuImageDisabledPackages
curl_devel
freetype_devel freetype_devel
libedit_devel libedit_devel
ncurses6_devel ncurses6_devel
build/jam/OptionalPackages
+6 -4
View File
@@ -76,7 +76,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageDisabledPackages curl_devel openssl_devel nghttp2_devel AddHaikuImageDisabledPackages openssl_devel
libjpeg_turbo_devel libpng16_devel zlib_devel ; libjpeg_turbo_devel libpng16_devel zlib_devel ;
} }
} }
@@ -89,13 +89,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageDisabledPackages binutils gcc mpc gmp mpfr ; AddHaikuImageDisabledPackages binutils gcc !gcc2 @{ mpc mpfr }@ ;
AddHaikuImageSourcePackages binutils gcc mpc gmp mpfr ; AddHaikuImageSystemPackages gmp@!gcc2 ;
AddHaikuImageSourcePackages binutils gcc !gcc2 @{ gmp mpc mpfr }@ ;
} }
} }
# other commonly used tools # other commonly used tools
AddHaikuImageDisabledPackages bison cdrtools flex jam m4 make mkdepend nasm patch ; AddHaikuImageDisabledPackages bison cdrtools flex jam m4 make mawk mkdepend
nasm@!gcc2 nasm_x86@secondary_x86 patch ;
AddHaikuImageSourcePackages bison cdrtools m4 make patch ; AddHaikuImageSourcePackages bison cdrtools m4 make patch ;
} }
build/jam/UserBuildConfig.ReadMe
+1 -1
View File
@@ -212,7 +212,7 @@ switch $(HAIKU_BUILD_PROFILE) {
case "disk" : { case "disk" : {
AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development
OpenSSH OpenSSL Welcome ; OpenSSH OpenSSL Welcome ;
AddHaikuImageSystemPackages bepdf cvs p7zip pe subversion vision wonderbrush ; AddHaikuImageSystemPackages bepdf git p7zip pe vision wonderbrush ;
} }
case "qemu" : { case "qemu" : {
build/jam/repositories/HaikuPorts/x86_64
+127 -87
View File
@@ -4,10 +4,10 @@ RemotePackageRepository HaikuPorts
: :
# architecture "any" packages # architecture "any" packages
be_book-2008_10_26-3 be_book-2008_10_26-3
ca_root_certificates-2020_01_01-1 ca_root_certificates-2021_01_19-1
gnu_efi_kernel-3.0.10-1 gnu_efi_kernel-3.0.10-1
haikuporter-1.2.3-2 haikuporter-1.2.3-2
noto-20170920-4 noto-20200106-1
noto_sans_cjk_jp-1.004-2 noto_sans_cjk_jp-1.004-2
timgmsoundfont-fixed-5 timgmsoundfont-fixed-5
wqy_microhei-0.2.0~beta-4 wqy_microhei-0.2.0~beta-4
@@ -15,59 +15,74 @@ RemotePackageRepository HaikuPorts
# repository architecture packages # repository architecture packages
# primary architecture (x86_64) # primary architecture (x86_64)
autoconf-2.69-8 autoconf-2.69-8
automake-1.16.2-1 automake-1.16.3-1
bash-5.0.017-1 bash-5.1-1
bc-1.07.1-2 bc-1.07.1-2
bepdf-2.1.2-1 bepdf-2.1.2-1
binutils-2.31.1-2 binutils-2.31.1-2
bison-3.5.4-1 bison-3.7.6-1
bzip2-1.0.8-1 bzip2-1.0.8-1
bzip2_devel-1.0.8-1 bzip2_devel-1.0.8-1
cdrtools-3.02~a09-1 cdrtools-3.02~a09-1
cdrtools_devel-3.02~a09-1 cdrtools_devel-3.02~a09-1
coreutils-8.29-2 coreutils-8.29-2
ctags-5.8-5 ctags-5.8-5
curl-7.70.0-2 curl-7.74.0-1
curl_devel-7.70.0-2 curl_devel-7.74.0-1
dav1d-0.8.2-1
dav1d_devel-0.8.2-1
diffutils-3.7-1 diffutils-3.7-1
expat-2.2.9-1 enca-1.19-2
expat_devel-2.2.9-1 enca_devel-1.19-2
ffmpeg-4.2.2-3 expat-2.2.10-1
ffmpeg_devel-4.2.2-3 expat_devel-2.2.10-1
findutils-4.7.0-1 fdk_aac-2.0.1-1
flex-2.6.4-1 ffmpeg-4.2.2-9
ffmpeg_devel-4.2.2-9
file-5.39-2
file_data-5.39-2
findutils-4.8.0-1
flex-2.6.4-2
fluidlite-1.0.0-3 fluidlite-1.0.0-3
fluidlite_devel-1.0.0-3 fluidlite_devel-1.0.0-3
fontconfig-2.13.92-1 fontconfig-2.13.92-1
fontconfig_devel-2.13.92-1 fontconfig_devel-2.13.92-1
freetype-2.9.1-2 freetype-2.10.4-3
freetype_devel-2.9.1-2 freetype_devel-2.10.4-3
gawk-5.1.0-1 fribidi-1.0.10-1
fribidi_devel-1.0.10-1
game_music_emu-0.6.3-1
game_music_emu_devel-0.6.3-1
gettext-0.19.8.1-7
gettext_libintl-0.19.8.1-7 gettext_libintl-0.19.8.1-7
gcc-8.3.0_2019_05_24-7 gcc-8.3.0_2019_05_24-9
gcc_syslibs-8.3.0_2019_05_24-7 gcc_syslibs-8.3.0_2019_05_24-9
gcc_syslibs_devel-8.3.0_2019_05_24-7 gcc_syslibs_devel-8.3.0_2019_05_24-9
giflib-5.2.1-1 giflib-5.2.1-1
giflib_devel-5.2.1-1 giflib_devel-5.2.1-1
git-2.26.0-2 git-2.30.2-2
git_arch-2.26.0-2 git_arch-2.30.2-2
git_cvs-2.26.0-2 git_cvs-2.30.2-2
git_daemon-2.26.0-2 git_daemon-2.30.2-2
git_email-2.26.0-2 git_email-2.30.2-2
git_svn-2.26.0-2 git_svn-2.30.2-2
glu-9.0.0-7 glu-9.0.0-7
glu_devel-9.0.0-7 glu_devel-9.0.0-7
gmp-6.1.2-3 gmp-6.2.1-1
grep-3.4-1 graphite2-1.3.14-1
groff-1.22.3-1 graphite2_devel-1.3.14-1
grep-3.6-2
groff-1.22.4-1
gutenprint8-5.3.1-1 gutenprint8-5.3.1-1
gutenprint8_devel-5.3.1-1 gutenprint8_devel-5.3.1-1
gzip-1.10-1 gzip-1.10-1
haikuwebkit-1.7.0-1 haikuwebkit-1.7.1-1
haikuwebkit_devel-1.7.0-1 haikuwebkit_devel-1.7.1-1
icu-57.2-2 harfbuzz-2.8.1-1
icu_devel-57.2-2 harfbuzz_devel-2.8.1-1
jam-2.5_2018_11_21-7 icu66-66.1-2
icu66_devel-66.1-2
jam-2.5_2018_11_21-8
jasper-2.0.16-4 jasper-2.0.16-4
jasper_devel-2.0.16-4 jasper_devel-2.0.16-4
keymapswitcher-1.2.7.15-1 keymapswitcher-1.2.7.15-1
@@ -76,110 +91,123 @@ RemotePackageRepository HaikuPorts
lcms-2.9-6 lcms-2.9-6
lcms_devel-2.9-6 lcms_devel-2.9-6
less-551-1 less-551-1
libbluray-1.1.2-1 libass-0.15.0-2
libbluray_devel-1.1.2-1 libass_devel-0.15.0-2
libdvdnav-6.0.1-2 libbluray-1.2.1-1
libdvdnav_devel-6.0.1-2 libbluray_devel-1.2.1-1
libdvdread-6.0.2-1 libdvdnav-6.0.1-3
libdvdread_devel-6.0.2-1 libdvdnav_devel-6.0.1-3
libedit-20180525_3.1-2 libdvdread-6.1.1-1
libedit_devel-20180525_3.1-2 libdvdread_devel-6.1.1-1
libedit-20210419_3.1-1
libedit_devel-20210419_3.1-1
libexecinfo-1.1-5 libexecinfo-1.1-5
libffi-3.2.1-5 libffi-3.2.1-6
libgcrypt-1.8.5-1 libgcrypt-1.8.5-1
libgpg_error-1.36-1 libgpg_error-1.36-1
libiconv-1.16-1 libiconv-1.16-1
libicns-0.8.1-8 libicns-0.8.1-8
libicns_devel-0.8.1-8 libicns_devel-0.8.1-8
libidn2-2.0.5-1 libidn2-2.0.5-2
libjpeg_turbo-2.0.3-3 libjpeg_turbo-2.0.6-1
libjpeg_turbo_devel-2.0.3-3 libjpeg_turbo_devel-2.0.6-1
libmodplug-0.8.9.0-1 libmodplug-0.8.9.0-1
libogg-1.3.4-1 libogg-1.3.4-1
libogg_devel-1.3.4-1 libogg_devel-1.3.4-1
libopenmpt-0.4.11-1 libopenmpt-0.5.5-1
libopenmpt_devel-0.4.11-1 libopenmpt_devel-0.5.5-1
libpcap-1.8.1-4 libpcap-1.8.1-4
libpcap_devel-1.8.1-4 libpcap_devel-1.8.1-4
libpcre2-10.36-1
libpcre-8.44-1 libpcre-8.44-1
libpcre2-10.34-2 libpcre_devel-8.44-1
libpng16-1.6.37-1 libpng16-1.6.37-1
libpng16_devel-1.6.37-1 libpng16_devel-1.6.37-1
libpsl-0.21.0-1 libpsl-0.21.0-1
libpsl_devel-0.21.0-1 libpsl_devel-0.21.0-1
libsolv-0.3.0_haiku_2014_12_22-3 libsolv-0.3.0_haiku_2014_12_22-3
libsolv_devel-0.3.0_haiku_2014_12_22-3 libsolv_devel-0.3.0_haiku_2014_12_22-3
libtasn1-4.15.0-1 libtasn1-4.16.0-1
libtheora-1.1.1-7 libtheora-1.1.1-7
libtheora_devel-1.1.1-7 libtheora_devel-1.1.1-7
libtool-2.4.6-2 libtool-2.4.6-2
libunistring-0.9.10-1 libunistring-0.9.10-1
libvorbis-1.3.6-1 libvorbis-1.3.7-1
libvorbis_devel-1.3.6-1 libvorbis_devel-1.3.7-1
libvpx-1.7.0-3 libvpx-1.8.2-1
libvpx_devel-1.7.0-3 libvpx_devel-1.8.2-1
libuuid-1.3.1-4 libuuid-1.3.1-4
libwebp-1.1.0-2 libwebp-1.1.0-2
libwebp_devel-1.1.0-2 libwebp_devel-1.1.0-2
libxml2-2.9.10-1 libxml2-2.9.10-4
libxml2_devel-2.9.10-1 libxml2_devel-2.9.10-4
libxslt-1.1.34-1 libxslt-1.1.34-3
live555-2016.06.22-5 live555-2016.06.22-5
live555_devel-2016.06.22-5 live555_devel-2016.06.22-5
llvm7-7.0.1-2 llvm7-7.0.1-2
llvm7_libs-7.0.1-2 llvm7_libs-7.0.1-2
m4-1.4.18-3 m4-1.4.18-3
make-4.1-3 make-4.1-4
mandoc-1.14.3-2 mandoc-1.14.3-2
mawk-1.3.4_20171017-1
mercurial-4.8.1-2 mercurial-4.8.1-2
mesa-17.1.10-6 mesa-17.1.10-6
mesa_devel-17.1.10-6 mesa_devel-17.1.10-6
mesa_swpipe-17.1.10-6 mesa_swpipe-17.1.10-6
mkdepend-1.7-5 mkdepend-1.7-5
mpc-1.1.0-2 mpc-1.2.1-1
mpfr-3.1.6-4 mpfr-4.1.0-1
nano-4.9.2-1 nano-5.7-1
nasm-2.14.02-2 nasm-2.14.02-2
ncurses6-6.2-1 ncurses6-6.2-1
ncurses6_devel-6.2-1 ncurses6_devel-6.2-1
netcat-1.10-4 netcat-1.10-4
nettle-3.5.1-1 nettle-3.7-1
nghttp2-1.40.0-1 nghttp2-1.43.0-1
nghttp2_devel-1.40.0-1 nghttp2_devel-1.43.0-1
openexr-2.4.1-1 openexr-2.4.1-1
openexr_devel-2.4.1-1 openexr_devel-2.4.1-1
openjpeg-2.3.1-2 openjpeg-2.4.0-1
openjpeg_devel-2.3.1-2 openjpeg_devel-2.4.0-1
openssh-8.3p1-1 openssh-8.4p1-2
openssl-1.1.1g-2 openssl-1.1.1k-1
openssl_devel-1.1.1g-2 openssl_devel-1.1.1k-1
p7zip-16.02-1 opus-1.3.1-1
opus_devel-1.3.1-1
p7zip-17.04-2
patch-2.7.6-2 patch-2.7.6-2
pdflib-5.0.3-3 pdflib-5.0.3-3
pdfwriter-1.0-3 pdfwriter-1.0-3
pe-2.4.5-8 pe-2.4.5-8
perl-5.30.2-1 perl-5.32.1-1
pkgconfig-0.29.2-4 pkgconfig-0.29.2-4
python-2.7.17-2 python3-3.7.10-1
qrencode_kdl_devel-3.4.4-2 qrencode_kdl_devel-3.4.4-2
readline-8.0.4-1 readline-8.1-1
sed-4.4-3 sed-4.8-1
sharutils-4.15.2-3 sharutils-4.15.2-3
snappy-1.1.8-1
snappy_devel-1.1.8-1
soxr-0.1.3-1
soxr_devel-0.1.3-1
speex-1.2.0-4 speex-1.2.0-4
speex_devel-1.2.0-4 speex_devel-1.2.0-4
sqlite-3.31.1.0-1 sqlite-3.34.1.0-1
subversion-1.9.7-2 subversion-1.14.1-1
subversion_devel-1.9.7-2 subversion_devel-1.14.1-1
taglib-1.11.1-4 taglib-1.12-1
taglib_devel-1.11.1-4 taglib_devel-1.12-1
tar-1.32-1 tar-1.34-1
tcpdump-4.9.2-1 tcpdump-4.9.2-1
texinfo-6.7-1 texinfo-6.7-2
tiff4-4.1.0-3 tiff4-4.2.0-1
tiff4_devel-4.1.0-3 tiff4_devel-4.2.0-1
tnftp-20151004-6
unzip-6.10c23-4 unzip-6.10c23-4
vision-0.10.4-1 vision-0.10.4-1
wget-1.20.3-3 wavpack-5.4.0-1
wavpack_devel-5.4.0-1
wget-1.21.1-1
which-2.21-6 which-2.21-6
wpa_supplicant-2.9.haiku.1-2 wpa_supplicant-2.9.haiku.1-2
xz_utils-5.2.5-1 xz_utils-5.2.5-1
@@ -204,31 +232,39 @@ RemotePackageRepository HaikuPorts
coreutils coreutils
ctags ctags
curl curl
dav1d
diffutils diffutils
enca
expat expat
fdk_aac
ffmpeg ffmpeg
file
findutils findutils
flex flex
fluidlite fluidlite
fontconfig fontconfig
freetype freetype
gawk fribidi
game_music_emu
gcc gcc
giflib giflib
git git
glu glu
gmp gmp
graphite2
grep grep
gutenprint8 gutenprint8
gzip gzip
haikuporter haikuporter
icu hqrfbuzz
icu66
jam jam
jasper jasper
keymapswitcher keymapswitcher
lame lame
lcms lcms
less less
libass
libbluray libbluray
libdvdnav libdvdnav
libdvdread libdvdread
@@ -264,6 +300,7 @@ RemotePackageRepository HaikuPorts
m4 m4
make make
mandoc mandoc
mawk
mercurial mercurial
mesa mesa
mkdepend mkdepend
@@ -279,6 +316,7 @@ RemotePackageRepository HaikuPorts
openjpeg openjpeg
openssh openssh
openssl openssl
opus
p7zip p7zip
patch patch
pdflib pdflib
@@ -286,10 +324,12 @@ RemotePackageRepository HaikuPorts
pe pe
perl perl
pkgconfig pkgconfig
python python3
readline readline
sed sed
sharutils sharutils
snappy
soxr
speex speex
sqlite sqlite
subversion subversion
@@ -300,6 +340,7 @@ RemotePackageRepository HaikuPorts
tiff4 tiff4
unzip unzip
vision vision
wavpack
wget wget
which which
wpa_supplicant wpa_supplicant
@@ -315,7 +356,6 @@ RemotePackageRepository HaikuPorts
diffutils diffutils
findutils findutils
freetype freetype
gawk
glu glu
grep grep
jpeg jpeg
build/jam/repositories/HaikuPorts/x86_gcc2
+152 -127
View File
@@ -4,10 +4,10 @@ RemotePackageRepository HaikuPorts
: :
# architecture "any" packages # architecture "any" packages
be_book-2008_10_26-3 be_book-2008_10_26-3
ca_root_certificates-2020_01_01-1 ca_root_certificates-2021_01_19-1
gnu_efi_kernel-3.0.10-1 gnu_efi_kernel-3.0.10-1
haikuporter-1.2.3-2 haikuporter-1.2.3-2
noto-20170920-4 noto-20200106-1
noto_sans_cjk_jp-1.004-2 noto_sans_cjk_jp-1.004-2
timgmsoundfont-fixed-5 timgmsoundfont-fixed-5
wqy_microhei-0.2.0~beta-4 wqy_microhei-0.2.0~beta-4
@@ -15,8 +15,8 @@ RemotePackageRepository HaikuPorts
# repository architecture packages # repository architecture packages
# primary architecture (x86_gcc2) # primary architecture (x86_gcc2)
autoconf-2.69-8 autoconf-2.69-8
automake-1.16.2-1 automake-1.16.3-1
bash-5.0.017-1 bash-5.1-1
bc-1.07.1-2 bc-1.07.1-2
bepdf-2.1.2-1 bepdf-2.1.2-1
binutils-2.17_2016_07_24-4 binutils-2.17_2016_07_24-4
@@ -27,43 +27,40 @@ RemotePackageRepository HaikuPorts
cdrtools_devel-3.02~a09-1 cdrtools_devel-3.02~a09-1
ctags-5.8-5 ctags-5.8-5
coreutils-8.24-2 coreutils-8.24-2
curl-7.70.0-2 curl-7.74.0-1
curl_devel-7.70.0-2 curl_devel-7.74.0-1
diffutils-3.7-1 diffutils-3.7-1
expat-2.2.9-1 expat-2.2.10-1
expat_devel-2.2.9-1 expat_devel-2.2.10-1
ffmpeg-4.2.2-9
ffmpeg_devel-4.2.2-9
file-5.39-2
file_data-5.39-2
findutils-4.6.0-1 findutils-4.6.0-1
ffmpeg-4.2.2-3 flex-2.6.4-2
ffmpeg_devel-4.2.2-3
flex-2.6.4-1
fluidlite_devel-1.0.0-3 fluidlite_devel-1.0.0-3
fontconfig-2.13.92-1 fontconfig-2.13.92-1
fontconfig_devel-2.13.92-1 fontconfig_devel-2.13.92-1
freetype-2.9.1-2 freetype-2.10.4-3
freetype_devel-2.9.1-2 freetype_devel-2.10.4-3
gawk-4.1.4-2
gettext_libintl-0.19.8.1-7 gettext_libintl-0.19.8.1-7
gcc-2.95.3_2017_07_20-2 gcc-2.95.3_2017_07_20-2
gcc_syslibs_devel-2.95.3_2017_07_20-2 gcc_syslibs_devel-2.95.3_2017_07_20-2
giflib6-5.0.5-5
giflib-5.1.4-2 giflib-5.1.4-2
giflib_devel-5.1.4-2 giflib_devel-5.1.4-2
git-2.26.0-2 git-2.30.2-2
git_arch-2.26.0-2 git_arch-2.30.2-2
git_cvs-2.26.0-2 git_daemon-2.30.2-2
git_daemon-2.26.0-2 git_email-2.30.2-2
git_email-2.26.0-2
git_svn-2.26.0-2
glu-9.0.0-7 glu-9.0.0-7
glu_devel-9.0.0-7 glu_devel-9.0.0-7
grep-2.24-1
groff-1.20.1-4 groff-1.20.1-4
gutenprint8-5.3.1-1 gutenprint8-5.3.1-1
gutenprint8_devel-5.3.1-1 gutenprint8_devel-5.3.1-1
gzip-1.10-1 gzip-1.10-1
icu-57.2-2 icu-57.2-3
icu_devel-57.2-2 icu_devel-57.2-3
jam-2.5_2018_11_21-7 jam-2.5_2018_11_21-8
jasper-2.0.16-4 jasper-2.0.16-4
jasper_devel-2.0.16-4 jasper_devel-2.0.16-4
keymapswitcher-1.2.7.15-1 keymapswitcher-1.2.7.15-1
@@ -72,20 +69,20 @@ RemotePackageRepository HaikuPorts
less-551-1 less-551-1
libedit-20180525_3.1-2 libedit-20180525_3.1-2
libedit_devel-20180525_3.1-2 libedit_devel-20180525_3.1-2
libffi-3.0.13-2 libffi-3.0.13-3
libiconv-1.16-1 libiconv-1.16-1
libicns-0.8.1-8 libicns-0.8.1-8
libicns_devel-0.8.1-8 libicns_devel-0.8.1-8
libjpeg_turbo-2.0.3-3 libjpeg_turbo-2.0.6-1
libjpeg_turbo_devel-2.0.3-3 libjpeg_turbo_devel-2.0.6-1
liblayout-1.4.1-8 liblayout-1.4.1-8
libmodplug-0.8.9.0-1 libmodplug-0.8.9.0-1
libogg-1.3.4-1 libogg-1.3.4-1
libogg_devel-1.3.4-1 libogg_devel-1.3.4-1
libpcap-1.8.1-3 libpcap-1.8.1-4
libpcap_devel-1.8.1-3 libpcap_devel-1.8.1-4
libpcre-8.44-1 libpcre-8.44-1
libpcre2-10.34-2 libpcre2-10.36-1
libpng16-1.6.37-1 libpng16-1.6.37-1
libpng16_devel-1.6.37-1 libpng16_devel-1.6.37-1
libpsl-0.21.0-1 libpsl-0.21.0-1
@@ -96,175 +93,199 @@ RemotePackageRepository HaikuPorts
libtheora_devel-1.1.1-7 libtheora_devel-1.1.1-7
libtool-2.4.6-2 libtool-2.4.6-2
libuuid-1.3.1-4 libuuid-1.3.1-4
libvorbis-1.3.6-1 libvorbis-1.3.7-1
libvorbis_devel-1.3.6-1 libvorbis_devel-1.3.7-1
libvpx-1.0.0-2 libvpx-1.0.0-2
libwebp-1.1.0-2 libwebp-1.1.0-2
libwebp_devel-1.1.0-2 libwebp_devel-1.1.0-2
libxml2-2.9.10-1 libxml2-2.9.10-4
libxml2_devel-2.9.10-1 libxml2_devel-2.9.10-4
live555-2016.06.22-5 live555-2016.06.22-5
live555_devel-2016.06.22-5 live555_devel-2016.06.22-5
m4-1.4.18-3 m4-1.4.18-3
make-4.1-3 make-4.1-4
mandoc-1.14.3-2 mandoc-1.14.3-2
mercurial-4.8.1-2
mesa-7.9.2-11 mesa-7.9.2-11
mesa_devel-7.9.2-11 mesa_devel-7.9.2-11
mesa_swrast-7.9.2-11 mesa_swrast-7.9.2-11
mkdepend-1.7-5 mkdepend-1.7-5
nano-2.9.8-3
nasm-2.12.02-1
ncurses6-6.2-1 ncurses6-6.2-1
ncurses6_devel-6.2-1 ncurses6_devel-6.2-1
netcat-1.10-4 netcat-1.10-4
nghttp2-1.40.0-1 nghttp2-1.43.0-1
nghttp2_devel-1.40.0-1
openexr-2.2.1-3 openexr-2.2.1-3
openexr_devel-2.2.1-3 openexr_devel-2.2.1-3
openjpeg-2.1.2-3 openjpeg-2.1.2-3
openjpeg_devel-2.1.2-3 openjpeg_devel-2.1.2-3
openssh-8.3p1-1 openssh-8.4p1-1
openssl-1.1.1g-2 openssl-1.1.1k-1
openssl_devel-1.1.1g-2 openssl_devel-1.1.1k-1
p7zip-16.02-1 opus-1.3.1-1
opus_devel-1.3.1-1
patch-2.7.5-3 patch-2.7.5-3
pdflib-5.0.3-3 pdflib-5.0.3-3
pdfwriter-1.0-3 pdfwriter-1.0-3
pe-2.4.5-8 pe-2.4.5-8
perl-5.30.2-1 perl-5.32.1-1
pkgconfig-0.29.2-4 pkgconfig-0.29.2-4
python-2.7.17-2
qrencode_kdl_devel-3.4.4-2 qrencode_kdl_devel-3.4.4-2
readline-8.0.4-1 readline-8.1-1
sed-4.2.1-6 sed-4.2.1-6
sharutils-4.15.2-3 sharutils-4.15.2-3
speex-1.2.0-4 speex-1.2.0-4
speex_devel-1.2.0-4 speex_devel-1.2.0-4
sqlite-3.31.1.0-1 sqlite-3.34.1.0-1
subversion-1.9.7-1
subversion_devel-1.9.7-1
taglib-1.7.2-3 taglib-1.7.2-3
taglib_devel-1.7.2-3 taglib_devel-1.7.2-3
tar-1.32-1
tcpdump-4.9.2-1 tcpdump-4.9.2-1
texinfo-6.1-5 texinfo-6.1-6
tiff4-4.1.0-3 tiff4-4.2.0-1
tiff4_devel-4.1.0-3 tiff4_devel-4.2.0-1
tnftp-20151004-6
unzip-6.10c23-4 unzip-6.10c23-4
vision-0.10.4-1 vision-0.10.4-1
wget-1.20.3-3 wget-1.21.1-1
which-2.21-6 which-2.21-6
wonderbrush-2.1.2-9 wonderbrush-2.1.2-11
wpa_supplicant-2.9.haiku.1-2 wpa_supplicant-2.9.haiku.1-2
zip-3.0-4 zip-3.0-4
zlib-1.2.11-4 zlib-1.2.11-4
zlib_devel-1.2.11-4 zlib_devel-1.2.11-4
# secondary architecture (x86) # secondary architecture (x86)
binutils_x86-2.26.1_2016_07_22-6 binutils_x86-2.26.1_2016_07_22-6
bison_x86-3.5.4-1 bison_x86-3.7.6-1
bzip2_x86-1.0.8-1 bzip2_x86-1.0.8-1
bzip2_x86_devel-1.0.8-1 bzip2_x86_devel-1.0.8-1
cdrtools_x86-3.02~a09-1 cdrtools_x86-3.02~a09-1
cdrtools_x86_devel-3.02~a09-1 cdrtools_x86_devel-3.02~a09-1
curl_x86-7.70.0-2 curl_x86-7.74.0-1
curl_x86_devel-7.70.0-2 curl_x86_devel-7.74.0-1
expat_x86-2.2.9-1 dav1d_x86-0.8.2-1
expat_x86_devel-2.2.9-1 dav1d_x86_devel-0.8.2-1
ffmpeg_x86-4.2.2-3 enca_x86-1.19-2
ffmpeg_x86_devel-4.2.2-3 enca_x86_devel-1.19-2
expat_x86-2.2.10-1
expat_x86_devel-2.2.10-1
fdk_aac_x86-2.0.1-1
ffmpeg_x86-4.2.2-9
ffmpeg_x86_devel-4.2.2-9
fluidlite_x86_devel-1.0.0-3 fluidlite_x86_devel-1.0.0-3
fontconfig_x86-2.13.92-1 fontconfig_x86-2.13.92-1
fontconfig_x86_devel-2.13.92-1 fontconfig_x86_devel-2.13.92-1
freetype_x86-2.9.1-2 freetype_x86-2.10.4-3
freetype_x86_devel-2.9.1-2 freetype_x86_devel-2.10.4-3
gcc_x86-8.3.0_2019_05_24-7 fribidi_x86-1.0.10-1
gcc_x86_syslibs-8.3.0_2019_05_24-7 fribidi_x86_devel-1.0.10-1
gcc_x86_syslibs_devel-8.3.0_2019_05_24-7 game_music_emu_x86-0.6.3-1
game_music_emu_x86_devel-0.6.3-1
gcc_x86-8.3.0_2019_05_24-9
gcc_x86_syslibs-8.3.0_2019_05_24-9
gcc_x86_syslibs_devel-8.3.0_2019_05_24-9
gettext_x86-0.19.8.1-7
gettext_x86_libintl-0.19.8.1-7 gettext_x86_libintl-0.19.8.1-7
giflib6_x86-5.0.5-5
giflib_x86-5.2.1-1 giflib_x86-5.2.1-1
giflib_x86_devel-5.2.1-1 giflib_x86_devel-5.2.1-1
glu_x86-9.0.0-7 glu_x86-9.0.0-7
glu_x86_devel-9.0.0-7 glu_x86_devel-9.0.0-7
gmp_x86-6.1.2-3 gmp_x86-6.2.1-1
haikuwebkit_x86-1.7.0-1 graphite2_x86-1.3.14-1
haikuwebkit_x86_devel-1.7.0-1 graphite2_x86_devel-1.3.14-1
icu_x86-57.2-2 grep_x86-3.6-2
icu_x86_devel-57.2-2 haikuwebkit_x86-1.7.1-1
icu66_x86-66.1-1 haikuwebkit_x86_devel-1.7.1-1
icu66_x86_devel-66.1-1 harfbuzz_x86-2.7.4-3
harfbuzz_x86_devel-2.7.4-3
icu66_x86-66.1-2
icu66_x86_devel-66.1-2
jasper_x86-2.0.16-4 jasper_x86-2.0.16-4
jasper_x86_devel-2.0.16-4 jasper_x86_devel-2.0.16-4
lame_x86-3.100-3 lame_x86-3.100-3
lame_x86_devel-3.100-3 lame_x86_devel-3.100-3
lcms_x86-2.9-6 lcms_x86-2.9-6
lcms_x86_devel-2.9-6 lcms_x86_devel-2.9-6
libass_x86-0.15.0-2
libass_x86_devel-0.15.0-2
libedit_x86-20180525_3.1-2 libedit_x86-20180525_3.1-2
libedit_x86_devel-20180525_3.1-2 libedit_x86_devel-20180525_3.1-2
libexecinfo_x86-1.1-5 libexecinfo_x86-1.1-5
libffi_x86-3.2.1-6
libffi_x86_devel-3.2.1-6
libgcrypt_x86-1.8.5-1 libgcrypt_x86-1.8.5-1
libgpg_error_x86-1.36-1 libgpg_error_x86-1.36-1
libiconv_x86-1.16-1 libiconv_x86-1.16-1
libiconv_x86_devel-1.16-1
libicns_x86-0.8.1-8 libicns_x86-0.8.1-8
libicns_x86_devel-0.8.1-8 libicns_x86_devel-0.8.1-8
libidn2_x86-2.0.5-1 libidn2_x86-2.0.5-2
libjpeg_turbo_x86-2.0.3-3 libjpeg_turbo_x86-2.0.6-1
libjpeg_turbo_x86_devel-2.0.3-3 libjpeg_turbo_x86_devel-2.0.6-1
libmodplug_x86-0.8.9.0-1 libmodplug_x86-0.8.9.0-1
libogg_x86-1.3.4-1 libogg_x86-1.3.4-1
libogg_x86_devel-1.3.4-1 libogg_x86_devel-1.3.4-1
libopenmpt_x86-0.4.11-1 libopenmpt_x86-0.5.5-1
libopenmpt_x86_devel-0.4.11-1 libopenmpt_x86_devel-0.5.5-1
libpcre_x86-8.44-1
libpcre_x86_devel-8.44-1
libpng16_x86-1.6.37-1 libpng16_x86-1.6.37-1
libpng16_x86_devel-1.6.37-1 libpng16_x86_devel-1.6.37-1
libsolv_x86-0.3.0_haiku_2014_12_22-3 libsolv_x86-0.3.0_haiku_2014_12_22-3
libsolv_x86_devel-0.3.0_haiku_2014_12_22-3 libsolv_x86_devel-0.3.0_haiku_2014_12_22-3
libtasn1_x86-4.15.0-1 libtasn1_x86-4.16.0-1
libtheora_x86-1.1.1-7 libtheora_x86-1.1.1-7
libtheora_x86_devel-1.1.1-7 libtheora_x86_devel-1.1.1-7
libtool_x86-2.4.6-2 libtool_x86-2.4.6-2
libtool_x86_libltdl-2.4.6-2 libtool_x86_libltdl-2.4.6-2
libunistring_x86-0.9.10-1 libunistring_x86-0.9.10-1
libvorbis_x86-1.3.6-1 libvorbis_x86-1.3.7-1
libvorbis_x86_devel-1.3.6-1 libvorbis_x86_devel-1.3.7-1
libvpx_x86-1.7.0-3 libvpx_x86-1.8.2-1
libvpx_x86_devel-1.7.0-3 libvpx_x86_devel-1.8.2-1
libwebp_x86-1.1.0-2 libwebp_x86-1.1.0-2
libwebp_x86_devel-1.1.0-2 libwebp_x86_devel-1.1.0-2
libxml2_x86-2.9.10-1 libxml2_x86-2.9.10-4
libxml2_x86_devel-2.9.10-1 libxml2_x86_devel-2.9.10-4
libxslt_x86-1.1.34-1 libxslt_x86-1.1.34-3
live555_x86-2016.06.22-5 live555_x86-2016.06.22-5
live555_x86_devel-2016.06.22-5 live555_x86_devel-2016.06.22-5
llvm_x86-5.0.0-3
llvm_x86_libs-5.0.0-3
llvm7_x86_libs-7.0.1-2 llvm7_x86_libs-7.0.1-2
mesa_x86-17.1.10-6 mesa_x86-17.1.10-6
mesa_x86_devel-17.1.10-6 mesa_x86_devel-17.1.10-6
mesa_x86_swpipe-17.1.10-6 mesa_x86_swpipe-17.1.10-6
nano_x86-5.5-1
nasm_x86-2.14.02-2
ncurses6_x86-6.2-1 ncurses6_x86-6.2-1
ncurses6_x86_devel-6.2-1 ncurses6_x86_devel-6.2-1
mpc_x86-1.1.0-2 mawk-1.3.4_20171017-1
mpfr_x86-3.1.6-4 mpc_x86-1.2.1-1
nettle_x86-3.5.1-1 mpfr_x86-4.1.0-1
nghttp2_x86-1.40.0-1 nettle_x86-3.7-1
nghttp2_x86_devel-1.40.0-1
openexr_x86-2.4.1-1 openexr_x86-2.4.1-1
openexr_x86_devel-2.4.1-1 openexr_x86_devel-2.4.1-1
openjpeg_x86-2.3.1-2 openjpeg_x86-2.4.0-1
openjpeg_x86_devel-2.3.1-2 openjpeg_x86_devel-2.4.0-1
openssl_x86-1.1.1g-2 openssl_x86-1.1.1k-1
openssl_x86_devel-1.1.1g-2 openssl_x86_devel-1.1.1k-1
opus_x86-1.3.1-1
opus_x86_devel-1.3.1-1
p7zip_x86-17.04-2
pkgconfig_x86-0.29.2-4 pkgconfig_x86-0.29.2-4
python3_x86-3.7.10-1
readline_x86-8.1-1
sharutils_x86-4.15.2-3 sharutils_x86-4.15.2-3
snappy_x86-1.1.8-1
snappy_x86_devel-1.1.8-1
soxr_x86-0.1.3-1
soxr_x86_devel-0.1.3-1
speex_x86-1.2.0-4 speex_x86-1.2.0-4
speex_x86_devel-1.2.0-4 speex_x86_devel-1.2.0-4
sqlite_x86-3.31.1.0-1 sqlite_x86-3.34.1.0-1
taglib_x86-1.11.1-4 taglib_x86-1.12-1
taglib_x86_devel-1.11.1-4 taglib_x86_devel-1.12-1
tiff4_x86-4.1.0-3 tar_x86-1.34-1
tiff4_x86_devel-4.1.0-3 tiff4_x86-4.2.0-1
tiff4_x86_devel-4.2.0-1
wavpack_x86-5.4.0-1
wavpack_x86_devel-5.4.0-1
xz_utils_x86-5.2.5-1 xz_utils_x86-5.2.5-1
xz_utils_x86_devel-5.2.5-1 xz_utils_x86_devel-5.2.5-1
zlib_x86-1.2.11-4 zlib_x86-1.2.11-4
@@ -286,39 +307,47 @@ RemotePackageRepository HaikuPorts
coreutils coreutils
ctags ctags
curl curl
dav1d_x86
diffutils diffutils
enca_x86
expat expat
findutils fdk_aac_x86
ffmpeg ffmpeg
ffmpeg_x86 ffmpeg_x86
file
findutils
flex flex
fluidlite fluidlite
fontconfig fontconfig
freetype freetype
gawk fribidi_x86
game_music_emu_x86
gcc gcc
gcc_x86 gcc_x86
giflib6
giflib giflib
git git
glu glu
gmp gmp
grep graphite2_x86
grep_x86
gutenprint8 gutenprint8
gzip gzip
haikuporter haikuporter
haikuwebkit_x86 haikuwebkit_x86
harfbuzz_x86
icu icu
icu66 icu66_x86
jam jam
jasper jasper
keymapswitcher keymapswitcher
lcms_x86 lcms_x86
less less
libass_x86
libedit libedit
libedit_x86 libedit_x86
libexecinfo libexecinfo
libffi libffi
libffi_x86
libgcrypt libgcrypt
libgpg_error libgpg_error
libiconv libiconv
@@ -333,37 +362,32 @@ RemotePackageRepository HaikuPorts
libpcre libpcre
libpcre2 libpcre2
libpng16 libpng16
libpng16_x86
libpsl libpsl
libsolv libsolv
libtasn1 libtasn1
libtheora libtheora
libtheora_x86
libtool libtool
libtool_x86
libunistring libunistring
libuuid libuuid
libvorbis libvorbis
libvorbis_x86
libvpx libvpx
libvpx_x86 libvpx_x86
libwebp libwebp
libxml2 libxml2
libxslt libxslt
live555 live555
llvm_x86 llvm7_x86
m4 m4
make make
mandoc mandoc
mercurial mawk
mesa mesa
mesa_x86 mesa_x86
mkdepend mkdepend
mpc mpc
mpfr mpfr
nghttp2 nano_x86
nano nasm_x86
nasm
ncurses6 ncurses6
netcat netcat
nettle nettle
@@ -372,29 +396,31 @@ RemotePackageRepository HaikuPorts
openjpeg openjpeg
openssh openssh
openssl openssl
p7zip opus
p7zip_x86
patch patch
pdflib pdflib
pdfwriter pdfwriter
pe pe
perl perl
pkgconfig pkgconfig
pkgconfig_x86 python_x86
python
readline readline
sed sed
sharutils sharutils
snappy_x86
soxr_x86
speex speex
sqlite sqlite
subversion
taglib taglib
taglib_x86 taglib_x86
tar tar_x86
tcpdump tcpdump
texinfo texinfo
tiff4 tiff4
unzip unzip
vision vision
wavpack_x86
wget wget
which which
wpa_supplicant wpa_supplicant
@@ -409,11 +435,10 @@ RemotePackageRepository HaikuPorts
ctags ctags
diffutils diffutils
findutils findutils
gawk
glu glu
grep grep
m4 m4
sed sed
tar tar_x86
which which
; ;
src/apps/devices/Jamfile
+3 -3
View File
@@ -20,7 +20,7 @@ rule ISAPnPHeaderGen
actions ISAPnPHeaderGen1 actions ISAPnPHeaderGen1
{ {
grep '^PNP[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] ' $(2[1]) \ grep '^PNP[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] ' $(2[1]) \
| gawk -f $(2[2]) > $(1) ; | awk -f $(2[2]) > $(1) ;
} }
ISAPnPHeaderGen [ FGristFiles isapnpids.h ] : isapnp_devids.txt : devlist2h.awk ; ISAPnPHeaderGen [ FGristFiles isapnpids.h ] : isapnp_devids.txt : devlist2h.awk ;
@@ -37,7 +37,7 @@ rule PCIHeaderGen
actions PCIHeaderGen1 actions PCIHeaderGen1
{ {
gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1]) awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
} }
local pciidsFile = pci.ids ; local pciidsFile = pci.ids ;
@@ -57,7 +57,7 @@ rule USBHeaderGen
actions USBHeaderGen1 actions USBHeaderGen1
{ {
gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1]) awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
} }
local usbidsFile = usb.ids ; local usbidsFile = usb.ids ;
src/data/package_infos/x86/haiku
-1
View File
@@ -55,7 +55,6 @@ requires {
cmd:tar cmd:tar
cmd:unzip cmd:unzip
#endif #endif
lib:libcurl
#ifdef HAIKU_BUILD_FEATURE_X86_LIBEDIT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_LIBEDIT_ENABLED
lib:libedit lib:libedit
#endif #endif
src/data/package_infos/x86_64/haiku
+8 -9
View File
@@ -9,7 +9,7 @@ boot loader, kernel, the system libraries, servers, and applications."
packager "The Haiku build system" packager "The Haiku build system"
vendor "Haiku Project" vendor "Haiku Project"
copyrights "2001-2020 Haiku, Inc. et al" copyrights "2001-2021 Haiku, Inc. et al"
licenses { licenses {
MIT MIT
"GNU LGPL v2.1" "GNU LGPL v2.1"
@@ -55,7 +55,6 @@ requires {
cmd:tar cmd:tar
cmd:unzip cmd:unzip
#endif #endif
lib:libcurl
#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBEDIT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBEDIT_ENABLED
lib:libedit lib:libedit
#endif #endif
@@ -64,12 +63,12 @@ requires {
#endif #endif
lib:libfreetype lib:libfreetype
lib:libgcc_s lib:libgcc_s
lib:libicudata >= 57 lib:libicudata >= 66
lib:libicui18n >= 57 lib:libicui18n >= 66
lib:libicuio >= 57 lib:libicuio >= 66
lib:libicutest >= 57 lib:libicutest >= 66
lib:libicutu >= 57 lib:libicutu >= 66
lib:libicuuc >= 57 lib:libicuuc >= 66
lib:libncurses >= 6.0 lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
#ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED
@@ -91,7 +90,7 @@ requires {
lib:libpng16 lib:libpng16
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
lib:libtiff >= 5.2 lib:libtiff >= 5.6
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED
lib:libwebp lib:libwebp
src/data/package_infos/x86_gcc2/haiku
+2 -3
View File
@@ -9,7 +9,7 @@ boot loader, kernel, the system libraries, servers, and applications."
packager "The Haiku build system" packager "The Haiku build system"
vendor "Haiku Project" vendor "Haiku Project"
copyrights "2001-2020 Haiku, Inc. et al" copyrights "2001-2021 Haiku, Inc. et al"
licenses { licenses {
MIT MIT
"GNU LGPL v2.1" "GNU LGPL v2.1"
@@ -56,7 +56,6 @@ requires {
cmd:tar cmd:tar
cmd:unzip cmd:unzip
#endif #endif
lib:libcurl
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBEDIT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBEDIT_ENABLED
lib:libedit lib:libedit
#endif #endif
@@ -91,7 +90,7 @@ requires {
lib:libpng16 lib:libpng16
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
lib:libtiff >= 5.2 lib:libtiff >= 5.6
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED
lib:libwebp lib:libwebp
src/data/package_infos/x86_gcc2/haiku_secondary
+8 -8
View File
@@ -10,7 +10,7 @@ other files required to run programs build for that architecture."
packager "The Haiku build system" packager "The Haiku build system"
vendor "Haiku Project" vendor "Haiku Project"
copyrights "2001-2020 Haiku, Inc. et al" copyrights "2001-2021 Haiku, Inc. et al"
licenses { licenses {
MIT MIT
"GNU LGPL v2.1" "GNU LGPL v2.1"
@@ -24,18 +24,18 @@ provides {
requires { requires {
lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0 lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2 lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.6
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimf_2_4_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libilmimf_2_4_%HAIKU_SECONDARY_PACKAGING_ARCH%
src/libs/compat/freebsd_network/Jamfile
+4 -4
View File
@@ -65,17 +65,17 @@ rule MIIHeaderGen
actions MIIHeaderGen1 actions MIIHeaderGen1
{ {
gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1]) awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
} }
MIIHeaderGen [ FGristFiles miidevs.h ] : miidevs : miidevs2h.awk ; MIIHeaderGen [ FGristFiles miidevs.h ] : miidevs : miidevs2h.awk ;
rule USBDevsHeaderGen rule USBDevsHeaderGen
{ {
SEARCH on $(2) = [ FDirName $(SUBDIR) compat dev usb ] ; SEARCH on $(2) = [ FDirName $(SUBDIR) compat dev usb ] ;
SEARCH on $(3) = [ FDirName $(SUBDIR) tools ] ; SEARCH on $(3) = [ FDirName $(SUBDIR) tools ] ;
Depends $(1) : $(2) $(3) ; Depends $(1) : $(2) $(3) ;
MakeLocateArch $(<) ; MakeLocateArch $(<) ;
USBDevsHeaderGen1 $(1) : $(2) $(3) ; USBDevsHeaderGen1 $(1) : $(2) $(3) ;
LocalClean clean : $(<) ; LocalClean clean : $(<) ;
@@ -83,7 +83,7 @@ rule USBDevsHeaderGen
actions USBDevsHeaderGen1 actions USBDevsHeaderGen1
{ {
gawk -v HEADERFILE=$(1[1]) -v DATAFILE=$(1[2]) -f $(2[2]) $(2[1]) awk -v HEADERFILE=$(1[1]) -v DATAFILE=$(1[2]) -f $(2[2]) $(2[1])
} }
USBDevsHeaderGen [ FGristFiles usbdevs.h usbdevs_data.h ] : usbdevs USBDevsHeaderGen [ FGristFiles usbdevs.h usbdevs_data.h ] : usbdevs