From: Vladimir Serbinenko Date: Thu, 24 Aug 2023 23:54:09 +0000 (+0200) Subject: configure: Add RPATH for freetype on NetBSD X-Git-Tag: grub-2.12~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3d49a697b1b177d59f50bc48f6ca269d46f5d92;p=thirdparty%2Fgrub.git configure: Add RPATH for freetype on NetBSD Without this build-time mkfont fails dynamic linking. This is not ideal but improves the situation until a better solution is available. Signed-off-by: Vladimir Serbinenko Reviewed-by: Daniel Kiper --- diff --git a/configure.ac b/configure.ac index 1fffe996d..8e16ce25f 100644 --- a/configure.ac +++ b/configure.ac @@ -1716,6 +1716,9 @@ if test x"$grub_mkfont_excuse" = x ; then CPPFLAGS="$SAVED_CPPFLAGS" LIBS="$SAVED_LIBS" ], [grub_mkfont_excuse=["need freetype2 library"]]) + if test x"$grub_mkfont_excuse" = x && test x"$host_kernel" = xnetbsd ; then + FREETYPE_LIBS="$FREETYPE_LIBS -Wl,-R,/usr/pkg/lib" ; + fi fi if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then @@ -1770,6 +1773,11 @@ if test x"$grub_build_mkfont_excuse" = x ; then LIBS="$SAVED_LIBS" CPPFLAGS="$SAVED_CPPFLAGS_2" ], [grub_build_mkfont_excuse=["need freetype2 library"]]) + if test x"$grub_build_mkfont_excuse" = x ; then + case x"$build_os" in + xnetbsd*) BUILD_FREETYPE_LIBS="$BUILD_FREETYPE_LIBS -Wl,-R,/usr/pkg/lib" ;; + esac + fi PKG_CONFIG="$SAVED_PKG_CONFIG" fi