diff options
| author | Jiri Slachta <jiri@slachta.eu> | 2022-12-03 17:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 17:15:19 +0100 |
| commit | 920fbc5c0a2e4badf51bceff42e9a1e3eb693462 (patch) | |
| tree | d027ebd2d7d52d52ce275b4f0f77de919acd3f66 /libs/pjproject/patches/0006-fix-pkg_config-file.patch | |
| parent | e2f370462421e20cccf09aa155cb78e6ff60d0c0 (diff) | |
| parent | 4f4e681c20ac28976ea7487957d14b20674d7d93 (diff) | |
Merge pull request #793 from micmac1/ast-18.5.1-21.02openwrt-21.02
[21.02] asterisk: bump to 18.15.1
Diffstat (limited to 'libs/pjproject/patches/0006-fix-pkg_config-file.patch')
| -rw-r--r-- | libs/pjproject/patches/0006-fix-pkg_config-file.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libs/pjproject/patches/0006-fix-pkg_config-file.patch b/libs/pjproject/patches/0006-fix-pkg_config-file.patch index b8e9391..c9d82b4 100644 --- a/libs/pjproject/patches/0006-fix-pkg_config-file.patch +++ b/libs/pjproject/patches/0006-fix-pkg_config-file.patch @@ -13,13 +13,12 @@ Description: Multimedia communication library --- a/build.mak.in +++ b/build.mak.in -@@ -314,8 +314,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) +@@ -348,6 +348,6 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FIL export PJ_INSTALL_DIR := @prefix@ --export PJ_INSTALL_INC_DIR := @includedir@ + 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) +-export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@ ++export PJ_INSTALL_CFLAGS := -DPJ_AUTOCONF=1 @ac_cflags@ + export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@ +-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS)) ++export PJ_INSTALL_LDFLAGS := $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS)) |