diff options
Diffstat (limited to 'user/bitlbee/use-pkg-config.patch')
| -rw-r--r-- | user/bitlbee/use-pkg-config.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/user/bitlbee/use-pkg-config.patch b/user/bitlbee/use-pkg-config.patch new file mode 100644 index 000000000..d0fc25cf1 --- /dev/null +++ b/user/bitlbee/use-pkg-config.patch @@ -0,0 +1,45 @@ +diff '--color=auto' -Nurd bitlbee-3.6/configure bitlbee-3.6.new/configure +--- bitlbee-3.6/configure 2019-02-07 11:53:38.000000000 -0800 ++++ bitlbee-3.6.new/configure 2025-07-26 14:09:52.082709917 -0700 +@@ -402,8 +402,8 @@ + { + if $PKG_CONFIG --exists gnutls; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs) +-CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags) ++EFLAGS+=$($PKG_CONFIG --libs gnutls) $(pkg-config libgcrypt --libs) ++CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(pkg-config libgcrypt --cflags) + EOF + ssl=gnutls + if ! $PKG_CONFIG gnutls --atleast-version=2.8; then +@@ -413,8 +413,8 @@ + ret=1 + elif libgnutls-config --version > /dev/null 2> /dev/null; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs) +-CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags) ++EFLAGS+=$(libgnutls-config --libs) $(pkg-config libgcrypt --libs) ++CFLAGS+=$(libgnutls-config --cflags) $(pkg-config libgcrypt --cflags) + EOF + + ssl=gnutls +@@ -762,15 +762,15 @@ + if [ "$otr" = 1 ]; then + # BI == built-in + echo '#define OTR_BI' >> config.h +- echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(pkg-config libgcrypt --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config libgcrypt --cflags)" >> Makefile.settings + echo 'OTR_BI=otr.o' >> Makefile.settings + elif [ "$otr" = "plugin" ]; then + # for some mysterious reason beyond the comprehension of my mortal mind, + # the libgcrypt flags aren't needed when building as plugin. add them anyway. + echo '#define OTR_PI' >> config.h +- echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(pkg-config libgcrypt --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config libgcrypt --cflags)" >> Makefile.settings + echo 'OTR_PI=otr.so' >> Makefile.settings + fi + |