[Pkg-voip-commits] [pjproject] 28/28: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Mon Dec 21 06:05:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master-broken-2
in repository pjproject.
commit a6aa0b621e537a885b97957c31e57250f8f33389
Merge: 7a69098 09439f0
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Mon Dec 21 07:48:04 2015 +0200
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0004-fix-link-order-WIP.patch | 26 ++++++++++++++++++--------
pjmedia/build/Makefile | 3 +--
3 files changed, 21 insertions(+), 12 deletions(-)
diff --cc debian/.git-dpm
index e0f6e72,0000000..a3e4d17
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 178f02749cdc4752a759dd46623fbad182e5faed
- 178f02749cdc4752a759dd46623fbad182e5faed
++09439f0f520ad37b90d2b5d0774e1fc68e9398f0
++09439f0f520ad37b90d2b5d0774e1fc68e9398f0
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0004-fix-link-order-WIP.patch
index d375cab,0000000..edb1733
mode 100644,000000..100644
--- a/debian/patches/0004-fix-link-order-WIP.patch
+++ b/debian/patches/0004-fix-link-order-WIP.patch
@@@ -1,201 -1,0 +1,211 @@@
- From 178f02749cdc4752a759dd46623fbad182e5faed Mon Sep 17 00:00:00 2001
++From 09439f0f520ad37b90d2b5d0774e1fc68e9398f0 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Sat, 5 Dec 2015 13:24:25 +0200
+Subject: fix link order (WIP)
+
+* Fix linking with --as-needed. Requires changing the link order to
+ place libs after library paths.
+* Fix the linking order in pjmedia: audiodev and videodev depend on the
+ main pjmedia library and not vice versa.
+---
+ build/os-auto.mak.in | 3 ++-
+ pjlib-util/build/Makefile | 4 ++--
+ pjlib/build/Makefile | 4 ++--
- pjmedia/build/Makefile | 12 +++++++-----
++ pjmedia/build/Makefile | 15 ++++++++-------
+ pjnath/build/Makefile | 4 ++--
+ pjsip-apps/build/Makefile | 4 ++--
+ pjsip-apps/src/python/setup.py | 2 +-
+ pjsip/build/Makefile | 13 ++++++++-----
- 8 files changed, 26 insertions(+), 20 deletions(-)
++ 8 files changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/build/os-auto.mak.in b/build/os-auto.mak.in
+index 3d99927..84d835c 100644
+--- a/build/os-auto.mak.in
++++ b/build/os-auto.mak.in
+@@ -4,7 +4,8 @@ export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
+
+ export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
+
+-export OS_LDFLAGS := @LDFLAGS@ @LIBS@
++export OS_LDFLAGS := @LDFLAGS@
++export OS_LIBS := @LIBS@
+
+ export OS_SOURCES :=
+
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index cb601cb..08c8e14 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -28,8 +28,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJLIB-UTIL library
+diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
+index 1e64950..3d8a663 100644
+--- a/pjlib/build/Makefile
++++ b/pjlib/build/Makefile
+@@ -22,8 +22,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(APP_LDFLAGS) \
++ $(M_LDFLAGS) $(HOST_LDFLAGS) $(LDFLAGS)
+
+
+ ###############################################################################
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
- index 702efdc..f95fc2d 100644
++index 702efdc..3c96891 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -50,8 +50,8 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+
+ export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
+ $(APP_THIRD_PARTY_EXT) \
+- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJMEDIA library
- @@ -98,6 +98,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
++@@ -79,8 +79,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
++
++ export PJMEDIA_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_CXXFLAGS += $(_CXXFLAGS)
++-export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
+++export PJMEDIA_LDFLAGS += \
++ $(PJLIB_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++ $(PJNATH_LDLIB) \
++@@ -98,6 +97,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
+ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
++ $(PJMEDIA_LDLIB) \
+ $(_LDFLAGS)
+
+
- @@ -111,6 +112,7 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
++@@ -111,6 +111,7 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
+ export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
++ $(PJMEDIA_LDLIB) \
+ $(_LDFLAGS)
+
+
- @@ -211,7 +213,7 @@ distclean: realclean
++@@ -211,7 +212,7 @@ distclean: realclean
+
+ pjmedia: $(PJMEDIA_LIB)
+ $(PJMEDIA_SONAME): $(PJMEDIA_LIB)
+-$(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
++$(PJMEDIA_LIB) $(PJMEDIA_SONAME):
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
+ pjmedia-codec: $(PJMEDIA_CODEC_LIB)
- @@ -221,12 +223,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++@@ -221,12 +222,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
+
+ pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
+ $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB)
+-$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME):
++$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
+ pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
+ $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB)
+-$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME):
++$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
+ pjsdp: $(PJSDP_LIB)
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 1bc08b5..cd2e63b 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -30,8 +30,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjlib-util/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJNATH library
+diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
+index 49ff2d7..1d082b5 100644
+--- a/pjsip-apps/build/Makefile
++++ b/pjsip-apps/build/Makefile
+@@ -18,8 +18,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjmedia/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJSUA
+diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py
+index 9eaed9d..8855fe5 100644
+--- a/pjsip-apps/src/python/setup.py
++++ b/pjsip-apps/src/python/setup.py
+@@ -92,7 +92,7 @@ if platform.system() == 'Darwin':
+ if version[0] == '10' and int(version[1]) >= 7:
+ extra_link_args += ["-framework", "AudioUnit"]
+ else:
+- extra_link_args = []
++ extra_link_args = ['-lpython2.7']
+
+
+ setup(name="pjsua",
+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
+index eef4176..29cea02 100644
+--- a/pjsip/build/Makefile
++++ b/pjsip/build/Makefile
+@@ -48,10 +48,13 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjmedia/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
++export _LDFLAGS := \
++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(APP_THIRD_PARTY_LIBS) \
+ $(APP_THIRD_PARTY_EXT) \
+- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++ $(HOST_LDFLAGS) \
++ $(OS_LIBS) \
++ $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJSIP core library
+@@ -141,7 +144,8 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ siptypes.o call.o presence.o media.o
+ export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
+ export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)
+-export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
++export PJSUA2_LIB_LDFLAGS += $(_LDFLAGS) \
++ $(PJSUA_LIB_LDLIB) \
+ $(PJSIP_UA_LDLIB) \
+ $(PJSIP_SIMPLE_LDLIB) \
+ $(PJSIP_LDLIB) \
+@@ -152,7 +156,6 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
+ $(PJNATH_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJLIB_LDLIB) \
+- $(_LDFLAGS) \
+ -lstdc++
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list