Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
kosloot committed Aug 8, 2024
1 parent 46cdbd3 commit f86ebb2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/unicode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,12 @@ jobs:
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get install libicu-dev libxml2-dev libbz2-dev;
sudo apt-get install zlib1g-dev cppcheck
sudo apt-get install zlib1g-dev
else
brew install libxml2
# brew reinstall icu4c
brew install bzip2
brew install zlib
brew install cppcheck
fi
- name: bootstrap
Expand Down
18 changes: 15 additions & 3 deletions m4/ac_osx_pkg.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# osx_pkg.m4 - Macros to add OSX brew locations to pkg-config. -*- Autoconf -*-
# serial 1
# serial 2 (pkg-config-0.24)
#
# Copyright © 2018 Ko van der Sloot <[email protected]>
# Copyright © 2024 Ko van der Sloot <[email protected]>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -40,6 +40,13 @@ case ${host_os} in
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/$i/lib/pkgconfig"
fi
done
for i in `ls /opt/homewbrew/opt`
do
if test -d "/opt/homebrew/opt/$i/lib/pkgconfig"
then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/homebrew/opt/$i/lib/pkgconfig"
fi
done
;;
esac
])
Expand All @@ -55,12 +62,17 @@ case ${host_os} in
# linux is wellbehaved
;;
darwin*)
# darwin isn't
# darwin/mac0s isn't
for i in $*
do
if test -d "/usr/local/opt/$i/lib/pkgconfig"
then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/$i/lib/pkgconfig"
else
if test -d "/opt/homebrew/opt//$i/lib/pkgconfig"
then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/homebrew/opt/$i/lib/pkgconfig"
fi
fi
done
;;
Expand Down
7 changes: 2 additions & 5 deletions src/tst.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#! /bin/sh
status=0
./main > tst.log 2>&1
status=$(($status + $?))
cat < afile
exit $status
./unicode > tst.log 2>&1
cat < tst.log

0 comments on commit f86ebb2

Please sign in to comment.