| 1 |
pinkbyte 13/12/31 10:15:53 |
| 2 |
|
| 3 |
Added: pjsip-2.1-multilib.patch |
| 4 |
Log: |
| 5 |
Revision bump: fix pkgconfig file generation, respect lib directory, wrt bug #496430. Thanks to Nikoli <nikoli AT gmx.us> for discovering this issues |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/pjsip/files/pjsip-2.1-multilib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pjsip/files/pjsip-2.1-multilib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pjsip/files/pjsip-2.1-multilib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pjsip-2.1-multilib.patch |
| 16 |
=================================================================== |
| 17 |
Buildsystem fixes for proper respecting multilib-aware systems |
| 18 |
|
| 19 |
Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=496430 |
| 20 |
|
| 21 |
--- Makefile.orig 2012-03-22 15:15:59.000000000 +0400 |
| 22 |
+++ Makefile 2013-12-31 13:50:16.434307159 +0400 |
| 23 |
@@ -108,14 +108,15 @@ |
| 24 |
prefix = $(ac_prefix) |
| 25 |
|
| 26 |
install: |
| 27 |
- mkdir -p $(DESTDIR)$(prefix)/lib |
| 28 |
- cp -f $(APP_LIB_FILES) $(DESTDIR)$(prefix)/lib/ |
| 29 |
+ mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR) |
| 30 |
+ cp -f $(APP_LIB_FILES) $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/ |
| 31 |
mkdir -p $(DESTDIR)$(prefix)/include |
| 32 |
for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ |
| 33 |
cp -RLf $$d/include/* $(DESTDIR)$(prefix)/include/; \ |
| 34 |
done |
| 35 |
- mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig |
| 36 |
- sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpjproject.pc.in | \ |
| 37 |
+ mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/pkgconfig |
| 38 |
+ sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \ |
| 39 |
+ sed -e "s!@LIBDIR@!$(PJ_INSTALL_LIB_DIR)!" | \ |
| 40 |
sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \ |
| 41 |
sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \ |
| 42 |
- sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpjproject.pc |
| 43 |
+ sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(PJ_INSTALL_LIB_DIR)/pkgconfig/libpjproject.pc |
| 44 |
--- libpjproject.pc.in.orig 2013-12-31 13:51:08.459302831 +0400 |
| 45 |
+++ libpjproject.pc.in 2013-12-31 13:51:16.857302132 +0400 |
| 46 |
@@ -2,7 +2,7 @@ |
| 47 |
|
| 48 |
prefix=@PREFIX@ |
| 49 |
exec_prefix=${prefix} |
| 50 |
-libdir=${exec_prefix}/lib |
| 51 |
+libdir=@LIBDIR@ |
| 52 |
includedir=${prefix}/include |
| 53 |
|
| 54 |
Name: libpjproject |
| 55 |
--- build.mak.in.orig 2013-12-31 13:52:22.492296672 +0400 |
| 56 |
+++ build.mak.in 2013-12-31 13:52:06.722297984 +0400 |
| 57 |
@@ -163,7 +163,7 @@ |
| 58 |
# library from the install location (i.e. --prefix) |
| 59 |
export PJ_INSTALL_DIR := @prefix@ |
| 60 |
export PJ_INSTALL_INC_DIR := $(PJ_INSTALL_DIR)/include |
| 61 |
-export PJ_INSTALL_LIB_DIR := $(PJ_INSTALL_DIR)/lib |
| 62 |
+export PJ_INSTALL_LIB_DIR := @libdir@ |
| 63 |
export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @CFLAGS@ |
| 64 |
export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS) |
| 65 |
export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS) |
Archives