[Pkg-voip-commits] [pjproject] 21/28: fix link order (WIP)
tzafrir at debian.org
tzafrir at debian.org
Mon Dec 21 06:05:52 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 81e46b7305ee0f434ebfb49e0b7a6f3c5689c1d8
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Sat Dec 5 13:24:25 2015 +0200
fix link order (WIP)
* Fix linking with --as-needed. Requires changing the link order to
place libs after library paths.
* FIXME: add two missing libraries. There must be a better way to do
that
---
build/os-auto.mak.in | 3 ++-
pjlib-util/build/Makefile | 4 ++--
pjlib/build/Makefile | 4 ++--
pjmedia/build/Makefile | 6 ++++--
pjnath/build/Makefile | 4 ++--
pjsip-apps/build/Makefile | 4 ++--
pjsip-apps/src/python/setup.py | 2 +-
pjsip/build/Makefile | 13 ++++++++-----
8 files changed, 23 insertions(+), 17 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..7613f5f 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 \
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 \
export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
+ $(PJMEDIA_LDLIB) \
$(_LDFLAGS)
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