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