Merge pull request #146871 from Grumbel/fix-guile-3.0

guile: fix non-existing libunistring include path
This commit is contained in:
Ryan Burns 2022-10-14 20:27:10 -04:00 committed by GitHub
commit 1e7b2e3dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -120,7 +120,7 @@ builder rec {
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"

View file

@ -111,7 +111,7 @@ builder rec {
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"

View file

@ -114,7 +114,7 @@ builder rec {
+ ''
sed -i "$out/lib/pkgconfig/guile"-*.pc \
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ;
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
s|includedir=$out|includedir=$dev|g
"