amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pjproject: Fix problem in pkg-config file.

Browse source 
* gnu/packages/patches/pjproject-correct-the-cflags-field.patch: Add patch.
* gnu/packages/patches/pjproject-fix-pkg-config-ldflags.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register the new patches.
* gnu/packages/telephony.scm (pjproject): Use them.
* gnu/packages/jami.scm (pjproject-jami): Remove a patch from
pjproject-jami that is already applied against pjproject.
This commit is contained in:
Maxim Cournoyer 2020-08-03 02:01:19 -04:00
parent 742c49bafe
commit 839bb42f0c
No known key found for this signature in database
GPG key ID: 1260E46482E63562
5 changed files with 163 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/patches/pjproject-fix-pkg-config-ldflags.patch Normal file
View file

@ -0,0 +1,34 @@
From 7a86f357ffa2339a67991e5f4f5610a218e80693 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 3 Aug 2020 17:43:19 -0400
Subject: [PATCH 2/2] build.mak.in: Filter out 3rd party libraries from
PJ_INSTALL_LDFLAGS.
This is done so users of the installed pjproject libraries do not get
directives (provided via pkg-config file of pjproject) to link against
pjproject's own library dependencies.
* build.mak.in (THIRD_PARTY_LIBRARIES): New variable.
(PJ_INSTALL_LDFLAGS): Filter out THIRD_PARTY_LIBRARIES.
---
build.mak.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.mak.in b/build.mak.in
index a9078bb25..86fd1ec30 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -314,8 +314,9 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FILES)
# And here are the variables to use if application is using the
# library from the install location (i.e. --prefix)
+THIRD_PARTY_LIBRARIES := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
export PJ_INSTALL_DIR := @prefix@
export PJ_INSTALL_INC_DIR := @includedir@
export PJ_INSTALL_LIB_DIR := @libdir@
export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDXXLIBS)
+export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(THIRD_PARTY_LIBRARIES),$(APP_LDXXLIBS))
--
2.27.0