Skip to content

Commit

Permalink
Fix compilation on FreeBSD 15.
Browse files Browse the repository at this point in the history
The regular expression to strip the /usr/local/include path from the
FREETYPE_CFLAGS has always been broken, but the break was never
detected because that path always appeared in the middle of the cflags
string.  In FreeBSD 15, that include path now appears at the end of
the cflags string and the broken regex fails to remove it.  Fix the
regular expression to correctly remove the include path at the end of
the cflags string.  This has been tested on FreeBSD 13, 14, and 15.
  • Loading branch information
linuxdude42 committed Mar 25, 2024
1 parent 07e06f7 commit 0ad35e9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mythtv/configure
Original file line number Diff line number Diff line change
Expand Up @@ -7298,7 +7298,7 @@ fi

if enabled freetype2; then
if test $target_os = "freebsd"; then
echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2 | sed -E -e 's#-I/usr/local/include ##g' -e 's#-I/usr/local/include\$##g')" >> $TMPMAK
echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2 | sed -E -e 's#-I/usr/local/include ##g' -e 's#-I/usr/local/include$##g')" >> $TMPMAK
else
echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2)" >> $TMPMAK
fi
Expand Down

0 comments on commit 0ad35e9

Please sign in to comment.