sys-kernel/xnu-headers: generate and install missing sys/ headers

generate and install
- sys/syscall.h
- sys/_posix_availability.h
- sys/_symbol_aliasing.h

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

diff --git a/sys-kernel/xnu-headers/Manifest b/sys-kernel/xnu-headers/Manifest
index 85c5e747399d271ec598a70d96d8110038939a4d..3c4c8674a561fc0d4c5f73e0a40d0a10e3413a01 100644 (file)
--- a/sys-kernel/xnu-headers/Manifest
+++ b/sys-kernel/xnu-headers/Manifest
@@ -1,3 +1,6 @@
+DIST AvailabilityVersions-26.50.4.tar.gz 888 BLAKE2B da3b41975c0259e23276bc8b3782fd8a97560d99d7c8c4e70bf31e619519ca2f684818f998449cef481f01966292bb9656e3899786645cbb506de96552b231bb SHA512 6b617b83108f03c1b7e571d4ed0b28151d6534e522fd412924a17d5273602334b9a720c126e03468bb23a052d6701e5158d462fc0de249c1615c76ff67f5b21f
+DIST AvailabilityVersions-32.60.1.tar.gz 947 BLAKE2B 5a0dd8947f5a20f4f3634535221f73eeed868d2a438530358d7da4618e48b24eaad6a75e87600af7a05bcf41e33cf18c36994af8cdf0e7d1412629affad15788 SHA512 6ba592b1621ef3766f8a230da944ad78775003d1ae64ffe0123862f22055eaa7a34ccc70945fe221170b2e9ab3147ddf968b45c063da01a1e34bbc539fcc4a3c
+DIST AvailabilityVersions-33.200.4.tar.gz 1321 BLAKE2B 3999fc45187e8ad98ee51ed0bfab4534d97d3f980bf0271e6f4185286eb6689ad237fbb589dca57cd37f5f6e5aeab4313f28065586aae12a22c6500e69e8e869 SHA512 7d2f94e676c6f05d5ddbcfcf52829387a453e99408ffaaae5b2eb001f23e53fc5ca3bb313e3ff011b08f40f990d606fcfcc94a4801fd862895def2889b0b7817
 DIST xnu-3789.70.16.tar.gz 10381005 BLAKE2B 16355a687f634820d0c639261254dec05ae7485e3b5fb6e264d2fbc848765cd3730f1cd8294808f44dff1117039d8b2eddfa5ebac35cf0c9752ea6f0655ec64b SHA512 d0b34305f5ca62cc66647366371fe7e99b18ab2f5d7c9f45d46be601d7a6e63b5f1c4e26cb5333ff829553e2332a3f5f9b1da35223fadfa95024587352e93dca
 DIST xnu-4570.71.2.tar.gz 11596858 BLAKE2B 0ccc47911e31e73472fa15263177ef72601d256917ce94000c06b916d34f2e0238f8dec6bd064247fbaf7c6a55e9b5a31a91ecb311a3b00d401448ed4dba1e14 SHA512 b4e76d10ae1fba17ab0deff523938e825e53eda922b6518805059442d248447f928bca4a2237851dd18c31e4bfb5ae1b4889b3c2a6eea186ccb5a0552204548e
 DIST xnu-4903.241.1.tar.gz 11985285 BLAKE2B fbc95bc398618a012f3b0f11bfef039f2bb3b7c17f123ab08e7943e9ab4f79f219227d44d72551b915577398b32b3338ac9938b37377037f2b00037b5fc7c854 SHA512 1878c44bcfd4eea65c8f98ae95dda1febe1bd9d3aa4d71eca62a3c320d604957e69b4b46338dabd4000781cedd515ea463c86f6311a84654b0ef7a6498ecfe29

diff --git a/sys-kernel/xnu-headers/xnu-headers-3789.70.16.ebuild b/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r1.ebuild
similarity index 56%
rename from sys-kernel/xnu-headers/xnu-headers-3789.70.16.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-3789.70.16-r1.ebuild
index f9ba384a3ea57eb214aa24d34f71243f18f95ce5..6368a081634a20a885b818d8980cc6e5529bc820 100644 (file)
--- a/sys-kernel/xnu-headers/xnu-headers-3789.70.16.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
+AVM="AvailabilityVersions-26.50.4"
 DESCRIPTION="System headers provided by XNU-${PV}, macOS 10.12.6"
 HOMEPAGE="https://opensource.apple.com/source/xnu"
-SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz"
+SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz
+       https://opensource.apple.com/tarballs/${AVM%-*}/${AVM}.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="10.12"
@@ -14,14 +16,33 @@ IUSE="+man"
 
 S=${WORKDIR}/xnu-${PV}
 
+src_prepare() {
+       default
+
+       # we don't install availability.pl, but generation needs it
+       local avpl="${WORKDIR}/${AVM}/availability.pl"
+       sed -i -e 's:${SDKROOT}/usr/local/libexec/availability.pl:'"${avpl}"':' \
+               bsd/sys/make_symbol_aliasing.sh || die
+}
+
 src_compile() {
-       : ; # nothing to compile
+       # crappy scripts that just about do the job
+       ./bsd/kern/makesyscalls.sh \
+               bsd/kern/syscalls.master header >& /dev/null || die
+       ./bsd/sys/make_posix_availability.sh \
+               _posix_availability.h >& /dev/null || die
+       ./bsd/sys/make_symbol_aliasing.sh \
+               dummy _symbol_aliasing.h >& /dev/null || die
 }
 
 src_install() {
        insinto /usr/include
        doins EXTERNAL_HEADERS/AssertMacros.h EXTERNAL_HEADERS/Availability*.h
 
+       # generated during src_compile
+       insinto /usr/include/sys
+       doins syscall.h _posix_availability.h _symbol_aliasing.h
+
        cd bsd || die
 
        get_datafiles() {

diff --git a/sys-kernel/xnu-headers/xnu-headers-4570.71.2.ebuild b/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r1.ebuild
similarity index 56%
rename from sys-kernel/xnu-headers/xnu-headers-4570.71.2.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-4570.71.2-r1.ebuild
index 580717e9b339bbe3fbc921d268ad57a5cae22056..406e29dca6274e49004ef780aec41ac828e1eed7 100644 (file)
--- a/sys-kernel/xnu-headers/xnu-headers-4570.71.2.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
+AVM="AvailabilityVersions-32.60.1"
 DESCRIPTION="System headers provided by XNU-${PV}, macOS 10.13.6"
 HOMEPAGE="https://opensource.apple.com/source/xnu"
-SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz"
+SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz
+       https://opensource.apple.com/tarballs/${AVM%-*}/${AVM}.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="10.13"
@@ -14,14 +16,33 @@ IUSE="+man"
 
 S=${WORKDIR}/xnu-${PV}
 
+src_prepare() {
+       default
+
+       # we don't install availability.pl, but generation needs it
+       local avpl="${WORKDIR}/${AVM}/availability.pl"
+       sed -i -e 's:${SDKROOT}/usr/local/libexec/availability.pl:'"${avpl}"':' \
+               bsd/sys/make_symbol_aliasing.sh || die
+}
+
 src_compile() {
-       : ; # nothing to compile
+       # crappy scripts that just about do the job
+       ./bsd/kern/makesyscalls.sh \
+               bsd/kern/syscalls.master header >& /dev/null || die
+       ./bsd/sys/make_posix_availability.sh \
+               _posix_availability.h >& /dev/null || die
+       ./bsd/sys/make_symbol_aliasing.sh \
+               dummy _symbol_aliasing.h >& /dev/null || die
 }
 
 src_install() {
        insinto /usr/include
        doins EXTERNAL_HEADERS/AssertMacros.h EXTERNAL_HEADERS/Availability*.h
 
+       # generated during src_compile
+       insinto /usr/include/sys
+       doins syscall.h _posix_availability.h _symbol_aliasing.h
+
        cd bsd || die
 
        get_datafiles() {

diff --git a/sys-kernel/xnu-headers/xnu-headers-4903.241.1.ebuild b/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r1.ebuild
similarity index 56%
rename from sys-kernel/xnu-headers/xnu-headers-4903.241.1.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-4903.241.1-r1.ebuild
index 12902e0c2553f00ed5c3512267e6f88ef40ff05b..cfe5c3e1d6c2a68efdf94966facb7208caac6b24 100644 (file)
--- a/sys-kernel/xnu-headers/xnu-headers-4903.241.1.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=7
 
+AVM="AvailabilityVersions-33.200.4"
 DESCRIPTION="System headers provided by XNU-${PV}, macOS 10.14.3"
 HOMEPAGE="https://opensource.apple.com/source/xnu"
-SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz"
+SRC_URI="https://opensource.apple.com/tarballs/xnu/xnu-${PV}.tar.gz
+       https://opensource.apple.com/tarballs/${AVM%-*}/${AVM}.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="10.14"
@@ -14,14 +16,33 @@ IUSE="+man"
 
 S=${WORKDIR}/xnu-${PV}
 
+src_prepare() {
+       default
+
+       # we don't install availability.pl, but generation needs it
+       local avpl="${WORKDIR}/${AVM}/availability.pl"
+       sed -i -e 's:${SDKROOT}/usr/local/libexec/availability.pl:'"${avpl}"':' \
+               bsd/sys/make_symbol_aliasing.sh || die
+}
+
 src_compile() {
-       : ; # nothing to compile
+       # crappy scripts that just about do the job
+       ./bsd/kern/makesyscalls.sh \
+               bsd/kern/syscalls.master header >& /dev/null || die
+       ./bsd/sys/make_posix_availability.sh \
+               _posix_availability.h >& /dev/null || die
+       ./bsd/sys/make_symbol_aliasing.sh \
+               dummy _symbol_aliasing.h >& /dev/null || die
 }
 
 src_install() {
        insinto /usr/include
        doins EXTERNAL_HEADERS/AssertMacros.h EXTERNAL_HEADERS/Availability*.h
 
+       # generated during src_compile
+       insinto /usr/include/sys
+       doins syscall.h _posix_availability.h _symbol_aliasing.h
+
        cd bsd || die
 
        get_datafiles() {