darwin.adv_cmds: fix implicit int, which is an error in clang 16

This commit is contained in:
Randy Eckenrode 2023-05-27 14:18:34 -04:00
parent 5611fa71ab
commit 56480a72c9
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 9 additions and 0 deletions

View File

@ -32,6 +32,9 @@ in appleDerivation {
substituteInPlace Makefile --replace perl true
substituteInPlace colldef.tproj/scan.l \
--replace 'static orderpass = 0;' 'static int orderpass = 0;'
for subproject in colldef mklocale monetdef msgdef numericdef timedef; do
substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \
--replace /usr/share/locale "" \
@ -42,6 +45,10 @@ in appleDerivation {
preBuild = ''
cp -r --no-preserve=all ${recentAdvCmds}/colldef .
substituteInPlace colldef/scan.l \
--replace 'static orderpass = 0;' 'static int orderpass = 0;'
pushd colldef
mv locale/collate.h .
flex -t -8 -i scan.l > scan.c

View File

@ -6,6 +6,8 @@ appleDerivation {
patchPhase = ''
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
--replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
substituteInPlace colldef/scan.l \
--replace 'static orderpass = 0;' 'static int orderpass = 0;'
'';
# pkill requires special private headers that are unavailable in