diff options
| author | Jiri Slachta | 2019-11-04 20:18:21 +0000 |
|---|---|---|
| committer | GitHub | 2019-11-04 20:18:21 +0000 |
| commit | 4ed639f655220e2270abb76557e9bc77e5c3d159 (patch) | |
| tree | 0ec94efe8288b140f35f4fdbd0f38220d27482ca | |
| parent | 72817e148c534d05907a043b8e15f9752e7dd5a1 (diff) | |
| parent | 93e08d1ad9d1385256666380d7eb970b1b36f382 (diff) | |
| download | telephony-4ed639f655220e2270abb76557e9bc77e5c3d159.tar.gz | |
Merge pull request #485 from micmac1/pj-pc
pjproject: fix pkg-config file
| -rw-r--r-- | libs/pjproject/Makefile | 2 | ||||
| -rw-r--r-- | libs/pjproject/patches/0006-fix-pkg_config-file.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index b75f0d3..8df3c80 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject PKG_VERSION:=2.9 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.pjsip.org/release/$(PKG_VERSION) diff --git a/libs/pjproject/patches/0006-fix-pkg_config-file.patch b/libs/pjproject/patches/0006-fix-pkg_config-file.patch new file mode 100644 index 0000000..e492577 --- /dev/null +++ b/libs/pjproject/patches/0006-fix-pkg_config-file.patch @@ -0,0 +1,25 @@ +--- a/libpjproject.pc.in ++++ b/libpjproject.pc.in +@@ -2,8 +2,8 @@ + + prefix=@PREFIX@ + exec_prefix=${prefix} +-libdir=@LIBDIR@ +-includedir=@INCLUDEDIR@ ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: libpjproject + Description: Multimedia communication library +--- a/build.mak.in ++++ b/build.mak.in +@@ -310,8 +310,7 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FIL + # And here are the variables to use if application is using the + # library from the install location (i.e. --prefix) + 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 @CFLAGS@ ++export PJ_INSTALL_CFLAGS := -DPJ_AUTOCONF=1 @CFLAGS@ + export PJ_INSTALL_CXXFLAGS := @CXXFLAGS@ $(PJ_INSTALL_CFLAGS) + export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS) |