From aea1470b5dc1db017be80d5d5f9e87c5404a0067 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 29 Dec 2023 13:47:54 -0500 Subject: [PATCH] fix(inetutils) clang on mac complaining something awful: ``` syslogd.c:281:7: error: conflicting types for 'ttymsg' char *ttymsg (struct iovec *, int, char *, int); ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/util.h:103:9: note: previous declaration is here char *ttymsg(struct iovec *, int, const char *, int); ``` closes #4659 --- projects/gnu.org/inetutils/package.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/projects/gnu.org/inetutils/package.yml b/projects/gnu.org/inetutils/package.yml index b31d7224..1838badd 100644 --- a/projects/gnu.org/inetutils/package.yml +++ b/projects/gnu.org/inetutils/package.yml @@ -14,12 +14,21 @@ dependencies: invisible-island.net/ncurses: '*' build: - script: | - ./configure $ARGS - make SUIDMODE= install - mkdir "{{prefix}}"/sbin - cd "{{prefix}}"/libexec - for x in *; do ln -s ../libexec/$x ../sbin; done + dependencies: + gnu.org/help2man: 1 + script: + # 2.5.0 has a conflicting definition on darwin + - run: | + if test "{{hw.platform}}" = "darwin"; then + sed -i -e 's/char \*ttymsg (struct iovec \*, int, char \*, int);/char *ttymsg (struct iovec *, int, const char *, int);/' syslogd.c + fi + working-directory: src + if: 2.5.0 + - ./configure $ARGS + - make SUIDMODE= install + - mkdir "{{prefix}}"/sbin + - run: for x in *; do ln -s ../libexec/$x ../sbin; done + working-directory: '{{prefix}}/libexec' env: ARGS: - --prefix="{{prefix}}"