[asterisk-commits] kpfleming: branch kpfleming/export-symbol-prefix r255905 - in /team/kpfleming...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri Apr  2 13:47:45 2010
New Revision: 255905

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255905
Log:
and now it works as desired

Added:
    team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script   (with props)
Modified:
    team/kpfleming/export-symbol-prefix/Makefile.moddir_rules
    team/kpfleming/export-symbol-prefix/Makefile.rules
    team/kpfleming/export-symbol-prefix/main/Makefile

Modified: team/kpfleming/export-symbol-prefix/Makefile.moddir_rules
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/export-symbol-prefix/Makefile.moddir_rules?view=diff&rev=255905&r1=255904&r2=255905
==============================================================================
--- team/kpfleming/export-symbol-prefix/Makefile.moddir_rules (original)
+++ team/kpfleming/export-symbol-prefix/Makefile.moddir_rules Fri Apr  2 13:47:45 2010
@@ -75,10 +75,6 @@
 $(LOADABLE_MODS:%=%.so): _ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
 
 $(EMBEDDED_MODS:%=%.o): _ASTCFLAGS+=-DEMBEDDED_MODULE=$*
-
-ifeq ($(GNU_LD),1)
-$(LOADABLE_MODS:%=%.so): $(if $(wildcard $(subst .so,.exports,$*)),$(subst .so,.exports,$*))
-endif
 
 $(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
 $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo

Modified: team/kpfleming/export-symbol-prefix/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/export-symbol-prefix/Makefile.rules?view=diff&rev=255905&r1=255904&r2=255905
==============================================================================
--- team/kpfleming/export-symbol-prefix/Makefile.rules (original)
+++ team/kpfleming/export-symbol-prefix/Makefile.rules Fri Apr  2 13:47:45 2010
@@ -117,10 +117,16 @@
 	$(CMD_PREFIX) $(CXX) -o $@ -E $< $(MAKE_DEPS) $(CXX_CFLAGS)
 
 %.so: %.o
+ifeq ($(GNU_LD),1)
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_version_script $* $(LINKER_SYMBOL_PREFIX)
+endif
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
 
 %.so: %.oo
+ifeq ($(GNU_LD),1)
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_version_script $* $(LINKER_SYMBOL_PREFIX)
+endif
 	$(ECHO_PREFIX) echo "   [LDXX] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(CXX_LDFLAGS_SO) $^ $(CXX_LIBS)
 
@@ -140,8 +146,4 @@
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $^ $(CXX_LIBS) $(ASTLDFLAGS)
 
-%.exports: %.exports.in
-	$(ECHO_PREFIX) echo "   [AWK] $< -> $@"
-	$(CMD_PREFIX) $(AWK) '{sub("LINKER_SYMBOL_PREFIX", "$(LINKER_SYMBOL_PREFIX)"); print;}' $< > $@
-
 dist-clean:: clean

Added: team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script?view=auto&rev=255905
==============================================================================
--- team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script (added)
+++ team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script Fri Apr  2 13:47:45 2010
@@ -1,0 +1,4 @@
+#!/bin/sh
+
+test -f ${1}.exports.in && ${AWK} "{sub(\"LINKER_SYMBOL_PREFIX\", \"${2}\"); print;}" ${1}.exports.in > ${1}.exports
+test -f ${1}.exports.in || rm -f ${1}.exports

Propchange: team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script
------------------------------------------------------------------------------
    svn:executable = *

Propchange: team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/kpfleming/export-symbol-prefix/build_tools/make_linker_version_script
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/kpfleming/export-symbol-prefix/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/export-symbol-prefix/main/Makefile?view=diff&rev=255905&r1=255904&r2=255905
==============================================================================
--- team/kpfleming/export-symbol-prefix/main/Makefile (original)
+++ team/kpfleming/export-symbol-prefix/main/Makefile Fri Apr  2 13:47:45 2010
@@ -167,7 +167,7 @@
 
 $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports
+$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
@@ -178,11 +178,14 @@
 
 ifeq ($(GNU_LD),1)
 $(MAIN_TGT): asterisk.exports
+asterisk.exports: asterisk.exports.in
+	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_version_script asterisk $(LINKER_SYMBOL_PREFIX)
 endif
 
 clean::
 	rm -f asterisk
 	rm -f db1-ast/.*.d
+	rm -f asterisk.exports
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean