[asterisk-commits] pjproject bundled: Fix missing inclusion of symbols (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4559 )

Change subject: pjproject_bundled:  Fix missing inclusion of symbols
......................................................................


pjproject_bundled:  Fix missing inclusion of symbols

Added back in a -g3, and an -O3 when DONT_OPTIMIZE is not set, to
the CFLAGS.  Not sure how they went missing.

Also fixed an uninstall problem where we weren't removing the
symlink from libasteriskpj.so.2 to libasteriskpj.so.  While I was
there, I fixed it for libasteriskssl as well.

Change-Id: I9e00873b1e9082d05b5549d974534b48a2142556
---
M main/Makefile
M third-party/Makefile
M third-party/pjproject/Makefile
3 files changed, 17 insertions(+), 5 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/main/Makefile b/main/Makefile
index 95c3c70..2b7321d 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -363,10 +363,14 @@
 	rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)"
 	rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
 ifneq ($(ASTSSL_LIB).$(ASTSSL_SO_VERSION),.)
-	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)"
+#   ASTSSL_SO_VERSION may not exist on Darwin
+	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" || :
+	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)"
 endif
 ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.)
-	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)"
+#   ASTSSL_SO_VERSION may not exist on Darwin
+	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)" || :
+	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
 endif
 ifneq ($(LDCONFIG),)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
diff --git a/third-party/Makefile b/third-party/Makefile
index 0aca21e..f3016f1 100644
--- a/third-party/Makefile
+++ b/third-party/Makefile
@@ -13,7 +13,7 @@
 MAKECMDGOALS:=$(subst dist-clean,distclean,$(MAKECMDGOALS))
 MAKECMDGOALS:=$(subst tpclean,clean,$(MAKECMDGOALS))
 
-all distclean dist-clean install tpclean : $(TP_SUBDIRS)
+all distclean dist-clean install uninstall tpclean : $(TP_SUBDIRS)
 install uninstall: $(TP_INSTALL_SUBDIRS)
 
 $(TP_SUBDIRS):
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 3f50a89..21bdf23 100644
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -20,6 +20,11 @@
     SPECIAL_TARGETS += clean
 endif
 
+ifeq ($(findstring uninstall,$(MAKECMDGOALS)),uninstall)
+    SPECIAL_TARGETS += uninstall
+endif
+
+
 ifneq ($(wildcard ../../makeopts),)
     include ../../makeopts
 endif
@@ -62,9 +67,12 @@
             source/pjsip-apps/src/python/_pjsua.so: LDFLAGS += -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive
             source/pjsip-apps/src/python/_pjsua.so: source/pjsip-apps/lib/libasterisk_malloc_debug.a
         endif
-        TARGETS += pjproject.symbols
-        export CFLAGS += $(CF)
+        ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+            CF += -O3
+        endif
+        export CFLAGS += $(CF) -g3
         export LDFLAGS += $(CC_LDFLAGS)
+        TARGETS += pjproject.symbols
     else
         all install:
     endif

-- 
To view, visit https://gerrit.asterisk.org/4559
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e00873b1e9082d05b5549d974534b48a2142556
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>