Check-in [bb510c2f21]
Overview
Comment:Updated to allow extra packages to include libraries to add
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:bb510c2f2131ec7909fe7bdc488192bf46aee57f
User & Date: rkeene on 2013-08-09 22:44:05
Other Links: manifest | tags
Context
2013-08-10
10:53
Minor semantic fix to Metakit build, no functional change check-in: fc9393d109 user: rkeene tags: trunk
2013-08-09
22:44
Updated to allow extra packages to include libraries to add check-in: bb510c2f21 user: rkeene tags: trunk
02:02
KitCreator 0.7.0 check-in: 4de8841dfc user: rkeene tags: trunk, 0.7.0
Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [9a21fd57db] to [fd44c1d90a].

   188    188   			continue
   189    189   		fi
   190    190   
   191    191   		AC_MSG_CHECKING([for libraries required for ${proj}])
   192    192   
   193    193   		projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | sort | tr "\n" ' '`"
   194    194   		projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
          195  +		projlibextra=""
   195    196   
   196         -		AC_MSG_RESULT([${projlibfilesnostub}])
          197  +		for libfile in ${projlibfilesnostub}; do
          198  +			if test -f "${libfile}.linkadd"; then
          199  +				projlibextra="`cat "${libfile}.linkadd"`"
          200  +			fi
          201  +		done
          202  +
          203  +		AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
   197    204   
   198    205   		hide_symbols="1"
   199    206   		initialize="1"
   200    207   
   201    208   		if test "${proj}" = "tcl"; then
   202    209   			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
   203    210   				projlibfiles="${projlibfilesnostub}"
................................................................................
   277    284   				echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
   278    285   
   279    286   				libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
   280    287   			fi
   281    288   		fi
   282    289   
   283    290   		ARCHS="${ARCHS} ${projlibfiles}"
          291  +		LIBS="${LIBS} ${projlibextra}"
   284    292   	done
   285    293   
   286    294   	echo '' >> kitInit-libs.h
   287    295   	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
   288    296   	for lib_init_func in ${libs_init_funcs}; do
   289    297   		proj="`echo ${lib_init_func} | sed 's@_Init$$@@@' | dd conv=lcase 2>/dev/null`"
   290    298   		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
   291    299   	done
   292    300   	echo '	return;' >> kitInit-libs.h
   293    301   	echo '}' >> kitInit-libs.h
   294    302   
   295    303   	AC_SUBST(ARCHS)
   296    304   	AC_SUBST(STRIPLIBS)
          305  +	AC_SUBST(LIBS)
   297    306   ])
   298    307   
   299    308   AC_DEFUN(DC_SETUP_TCL_PLAT_DEFS, [
   300    309   	AC_CANONICAL_BUILD
   301    310   	AC_CANONICAL_HOST
   302    311     
   303    312   	AC_MSG_CHECKING(host operating system)