Multi-library support with core suffix in soname
RFC PATCH 1/1 Multi-library support with core suffix in soname
This will allow (for users) installing both versions of libs into the same system and (for distributions) having them without conflicts in the same repository.
Such script is used to change Makefile.am-s:
for lib in copperplate alchemy psos smokey trank vxworks do
find -name Makefile.am \
| xargs -r \
sed -i -e "s/lib${lib}\.la/lib${lib}@CORE@\.la/g" \
-e "s/lib${lib}\_la/lib${lib}@CORE@\_la/g"done
--- configure.ac | 7 +++++++ demo/alchemy/Makefile.am | 4 ++-- demo/alchemy/cobalt/Makefile.am | 4 ++-- lib/alchemy/Makefile.am | 16 ++++++++-------- lib/copperplate/Makefile.am | 24 ++++++++++++------------ lib/copperplate/regd/Makefile.am | 2 +- lib/psos/Makefile.am | 14 +++++++------- lib/smokey/Makefile.am | 10 +++++----- lib/trank/Makefile.am | 12 ++++++------ lib/vxworks/Makefile.am | 14 +++++++------- scripts/xeno-config-cobalt.in | 5 +++-- scripts/xeno-config-mercury.in | 5 +++-- testsuite/gpiotest/Makefile.am | 2 +- testsuite/smokey/Makefile.am | 4 ++-- testsuite/smokey/dlopen/Makefile.am | 6 +++--- testsuite/spitest/Makefile.am | 2 +- utils/analogy/Makefile.am | 8 ++++---- utils/can/Makefile.am | 8 ++++---- utils/hdb/Makefile.am | 2 +- 19 files changed, 79 insertions(+), 70 deletions(-)
configure.ac +7 -0
@@ -859,6 +859,11 @@ dnl in-tree executables which require POSIX symbol wrapping. AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ["$modechk_wrappers $cobalt_wrappers"]) fi +dnl Multi-core support. +if test $rtcore_type = mercury; then + CORE="_$rtcore_type" +fi + dnl dnl Build the Makefiles dnl
@@ -898,6 +903,8 @@ AC_SUBST(XENO_TEST_DIR) AC_SUBST(XENO_DEMO_DIR) AC_SUBST(XENO_BUILD_COMPILER) AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(CORE) AC_CONFIG_FILES([ \ Makefile \
demo/alchemy/Makefile.am +2 -2
@@ -11,8 +11,8 @@ cppflags = \ -I$(top_srcdir)/include ldadd = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt -lm
demo/alchemy/cobalt/Makefile.am +2 -2
@@ -11,8 +11,8 @@ cppflags = \ ldadd = \ @XENO_AUTOINIT_LDFLAGS@ \ $(XENO_POSIX_WRAPPERS) \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la \ + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lm
lib/alchemy/Makefile.am +8 -8
@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libalchemy.la +lib_LTLIBRARIES = libalchemy@[email protected] -libalchemy_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libalchemy@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libalchemy_la_LIBADD = \ +libalchemy@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libalchemy_la_SOURCES = \ +libalchemy@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \
@@ -33,12 +33,12 @@ libalchemy_la_SOURCES = \ timer.h if XENO_COBALT -libalchemy_la_SOURCES += \ +libalchemy@CORE@_la_SOURCES += \ pipe.c \ pipe.h endif -libalchemy_la_CPPFLAGS = \ +libalchemy@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib
@@ -48,6 +48,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libalchemy_la_SOURCES); do \ + @for i in $(libalchemy@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ done
lib/copperplate/Makefile.am +12 -12
@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libcopperplate.la +lib_LTLIBRARIES = libcopperplate@[email protected] -libcopperplate_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 -libcopperplate_la_LIBADD = @XENO_CORE_LDADD@ +libcopperplate@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 +libcopperplate@CORE@_la_LIBADD = @XENO_CORE_LDADD@ noinst_LTLIBRARIES = -libcopperplate_la_SOURCES = \ +libcopperplate@CORE@_la_SOURCES = \ clockobj.c \ cluster.c \ eventobj.c \
@@ -19,35 +19,35 @@ libcopperplate_la_SOURCES = \ timerobj.c \ traceobj.c -libcopperplate_la_CPPFLAGS = \ +libcopperplate@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib if XENO_REGISTRY -libcopperplate_la_LIBADD += libregistry.la +libcopperplate@CORE@_la_LIBADD += libregistry.la noinst_LTLIBRARIES += libregistry.la libregistry_la_SOURCES = registry.c libregistry_la_CPPFLAGS = \ - $(libcopperplate_la_CPPFLAGS) \ + $(libcopperplate@CORE@_la_CPPFLAGS) \ @XENO_FUSE_CFLAGS@ endif if XENO_PSHARED # The process shareable heap has real-time properties, therefore it # fits both the cobalt and mercury cores equally. Yummie. -libcopperplate_la_SOURCES += heapobj-pshared.c reference.c +libcopperplate@CORE@_la_SOURCES += heapobj-pshared.c reference.c endif if XENO_TLSF -libcopperplate_la_SOURCES += heapobj-tlsf.c +libcopperplate@CORE@_la_SOURCES += heapobj-tlsf.c else if XENO_HEAPMEM -libcopperplate_la_SOURCES += heapobj-heapmem.c +libcopperplate@CORE@_la_SOURCES += heapobj-heapmem.c else -libcopperplate_la_SOURCES += heapobj-malloc.c +libcopperplate@CORE@_la_SOURCES += heapobj-malloc.c endif endif
@@ -62,6 +62,6 @@ DIST_SUBDIRS = regd SPARSE = sparse sparse: - @for i in $(libcopperplate_la_SOURCES) ; do \ + @for i in $(libcopperplate@CORE@_la_SOURCES) ; do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ done
lib/copperplate/regd/Makefile.am +1 -1
@@ -9,7 +9,7 @@ CPPFLAGS = \ LDFLAGS = $(XENO_POSIX_WRAPPERS) LDADD = \ - ../libcopperplate.la \ + ../libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
lib/psos/Makefile.am +7 -7
@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libpsos.la +lib_LTLIBRARIES = libpsos@[email protected] -libpsos_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libpsos@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libpsos_la_LIBADD = \ +libpsos@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libpsos_la_SOURCES = \ +libpsos@CORE@_la_SOURCES = \ init.c \ internal.h \ pt.c \
@@ -23,7 +23,7 @@ libpsos_la_SOURCES = \ tm.h \ reference.h -libpsos_la_CPPFLAGS = \ +libpsos@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib
@@ -33,6 +33,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libpsos_la_SOURCES); do \ + @for i in $(libpsos@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ done
lib/smokey/Makefile.am +5 -5
@@ -1,13 +1,13 @@ -lib_LTLIBRARIES = libsmokey.la +lib_LTLIBRARIES = libsmokey@[email protected] -libsmokey_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libsmokey_la_LIBADD = @XENO_CORE_LDADD@ +libsmokey@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libsmokey@CORE@_la_LIBADD = @XENO_CORE_LDADD@ -libsmokey_la_SOURCES = \ +libsmokey@CORE@_la_SOURCES = \ helpers.c \ init.c -libsmokey_la_CPPFLAGS = \ +libsmokey@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib
lib/trank/Makefile.am +6 -6
@@ -1,20 +1,20 @@ -lib_LTLIBRARIES = libtrank.la +lib_LTLIBRARIES = libtrank@[email protected] -libtrank_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libtrank@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libtrank_la_LIBADD = \ +libtrank@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/alchemy/libalchemy.la + $(top_builddir)/lib/alchemy/libalchemy@[email protected] -libtrank_la_SOURCES = \ +libtrank@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \ posix.c \ native.c -libtrank_la_CPPFLAGS = \ +libtrank@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -D__XENO_COMPAT__ \ -I$(top_srcdir)/include \
lib/vxworks/Makefile.am +7 -7
@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libvxworks.la +lib_LTLIBRARIES = libvxworks@[email protected] -libvxworks_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libvxworks@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libvxworks_la_LIBADD = \ +libvxworks@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libvxworks_la_SOURCES = \ +libvxworks@CORE@_la_SOURCES = \ init.c \ errnoLib.c \ intLib.c \
@@ -32,7 +32,7 @@ libvxworks_la_SOURCES = \ sysLib.c \ reference.h -libvxworks_la_CPPFLAGS = \ +libvxworks@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib
@@ -42,6 +42,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libvxworks_la_SOURCES); do \ + @for i in $(libvxworks@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ done
scripts/xeno-config-cobalt.in +3 -2
@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"
@@ -264,8 +265,8 @@ if test x$do_ldflags = xy; then # --[no-]mode-check does. ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="$ldflags -l$skin" + copperplate="-lcopperplate$core" + ldflags="$ldflags -l$skin$core" if [ -r ${XENO_LIBRARY_DIR}/${skin}.wrappers ]; then ldflags=" `dump_wrappers ${skin}.wrappers` $ldflags" fi
scripts/xeno-config-mercury.in +3 -2
@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"
@@ -195,8 +196,8 @@ if test x$do_ldflags = xy; then posix|rtdm) ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="-l$skin $ldflags" + copperplate="-lcopperplate$core" + ldflags="-l$skin$core $ldflags" ;; *) echo "unknown API: $skin" 1>&2
testsuite/gpiotest/Makefile.am +1 -1
@@ -13,7 +13,7 @@ gpiotest_CPPFLAGS = \ gpiotest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) gpiotest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
testsuite/smokey/Makefile.am +2 -2
@@ -110,8 +110,8 @@ smokey_LDFLAGS=$(wrappers) @XENO_AUTOINIT_LDFLAGS@ $(undef_list) smokey_LDADD = \ $(plugin_list) \ - ../../lib/smokey/libsmokey.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/smokey/libsmokey@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
testsuite/smokey/dlopen/Makefile.am +3 -3
@@ -11,8 +11,8 @@ libalchemy_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] libalchemy_test_la_SOURCES = libalchemy-test.c
@@ -29,7 +29,7 @@ libposix_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/copperplate/libcopperplate@[email protected] libposix_test_la_SOURCES = libposix-test.c
testsuite/spitest/Makefile.am +1 -1
@@ -13,7 +13,7 @@ spitest_CPPFLAGS = \ spitest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) spitest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
utils/analogy/Makefile.am +4 -4
@@ -42,8 +42,8 @@ cmd_read_SOURCES = cmd_read.c cmd_read_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lm
@@ -52,8 +52,8 @@ cmd_write_SOURCES = cmd_write.c cmd_write_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lm
utils/can/Makefile.am +4 -4
@@ -20,8 +20,8 @@ rtcanconfig_LDADD = \ rtcanrecv_SOURCES = rtcanrecv.c rtcanrecv_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
@@ -29,8 +29,8 @@ rtcanrecv_LDADD = \ rtcansend_SOURCES = rtcansend.c rtcansend_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
utils/hdb/Makefile.am +1 -1
@@ -9,7 +9,7 @@ hdb_CPPFLAGS = \ hdb_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ hdb_LDADD = \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
Signature · 1 line
2.21.0
Quoted 3 lines · Vitaly Chikunov
This will allow (for users) installing both versions of libs into the same system and (for distributions) having them without conflicts in the same repository.
I forgot we need to install xeno_config.h somewhere somehow. Otherwise, it would be overwritten by other core.
Quoted 529 lines
Such script is used to change Makefile.am-s:
for lib in copperplate alchemy psos smokey trank vxworks do
find -name Makefile.am \ | xargs -r \ sed -i -e "s/lib${lib}\.la/lib${lib}@CORE@\.la/g" \ -e "s/lib${lib}\_la/lib${lib}@CORE@\_la/g"done
Signed-off-by Vitaly Chikunov <[email protected]>--- configure.ac | 7 +++++++ demo/alchemy/Makefile.am | 4 ++-- demo/alchemy/cobalt/Makefile.am | 4 ++-- lib/alchemy/Makefile.am | 16 ++++++++-------- lib/copperplate/Makefile.am | 24 ++++++++++++------------ lib/copperplate/regd/Makefile.am | 2 +- lib/psos/Makefile.am | 14 +++++++------- lib/smokey/Makefile.am | 10 +++++----- lib/trank/Makefile.am | 12 ++++++------ lib/vxworks/Makefile.am | 14 +++++++------- scripts/xeno-config-cobalt.in | 5 +++-- scripts/xeno-config-mercury.in | 5 +++-- testsuite/gpiotest/Makefile.am | 2 +- testsuite/smokey/Makefile.am | 4 ++-- testsuite/smokey/dlopen/Makefile.am | 6 +++--- testsuite/spitest/Makefile.am | 2 +- utils/analogy/Makefile.am | 8 ++++---- utils/can/Makefile.am | 8 ++++---- utils/hdb/Makefile.am | 2 +- 19 files changed, 79 insertions(+), 70 deletions(-)configure.ac +7
-0@@ -859,6 +859,11 @@ dnl in-tree executables which require POSIX symbol wrapping. AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ["$modechk_wrappers $cobalt_wrappers"]) fi +dnl Multi-core support. +if test $rtcore_type = mercury; then + CORE="_$rtcore_type" +fi + dnl dnl Build the Makefiles dnl@@ -898,6 +903,8 @@ AC_SUBST(XENO_TEST_DIR) AC_SUBST(XENO_DEMO_DIR) AC_SUBST(XENO_BUILD_COMPILER) AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(CORE) AC_CONFIG_FILES([ \ Makefile \demo/alchemy/Makefile.am +2
-2@@ -11,8 +11,8 @@ cppflags = \ -I$(top_srcdir)/include ldadd = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt -lmdemo/alchemy/cobalt/Makefile.am +2
-2@@ -11,8 +11,8 @@ cppflags = \ ldadd = \ @XENO_AUTOINIT_LDFLAGS@ \ $(XENO_POSIX_WRAPPERS) \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la \ + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lmlib/alchemy/Makefile.am +8
-8@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libalchemy.la +lib_LTLIBRARIES = libalchemy@[email protected] -libalchemy_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libalchemy@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libalchemy_la_LIBADD = \ +libalchemy@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libalchemy_la_SOURCES = \ +libalchemy@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \@@ -33,12 +33,12 @@ libalchemy_la_SOURCES = \ timer.h if XENO_COBALT -libalchemy_la_SOURCES += \ +libalchemy@CORE@_la_SOURCES += \ pipe.c \ pipe.h endif -libalchemy_la_CPPFLAGS = \ +libalchemy@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -48,6 +48,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libalchemy_la_SOURCES); do \ + @for i in $(libalchemy@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/copperplate/Makefile.am +12
-12@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libcopperplate.la +lib_LTLIBRARIES = libcopperplate@[email protected] -libcopperplate_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 -libcopperplate_la_LIBADD = @XENO_CORE_LDADD@ +libcopperplate@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 +libcopperplate@CORE@_la_LIBADD = @XENO_CORE_LDADD@ noinst_LTLIBRARIES = -libcopperplate_la_SOURCES = \ +libcopperplate@CORE@_la_SOURCES = \ clockobj.c \ cluster.c \ eventobj.c \@@ -19,35 +19,35 @@ libcopperplate_la_SOURCES = \ timerobj.c \ traceobj.c -libcopperplate_la_CPPFLAGS = \ +libcopperplate@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib if XENO_REGISTRY -libcopperplate_la_LIBADD += libregistry.la +libcopperplate@CORE@_la_LIBADD += libregistry.la noinst_LTLIBRARIES += libregistry.la libregistry_la_SOURCES = registry.c libregistry_la_CPPFLAGS = \ - $(libcopperplate_la_CPPFLAGS) \ + $(libcopperplate@CORE@_la_CPPFLAGS) \ @XENO_FUSE_CFLAGS@ endif if XENO_PSHARED # The process shareable heap has real-time properties, therefore it # fits both the cobalt and mercury cores equally. Yummie. -libcopperplate_la_SOURCES += heapobj-pshared.c reference.c +libcopperplate@CORE@_la_SOURCES += heapobj-pshared.c reference.c endif if XENO_TLSF -libcopperplate_la_SOURCES += heapobj-tlsf.c +libcopperplate@CORE@_la_SOURCES += heapobj-tlsf.c else if XENO_HEAPMEM -libcopperplate_la_SOURCES += heapobj-heapmem.c +libcopperplate@CORE@_la_SOURCES += heapobj-heapmem.c else -libcopperplate_la_SOURCES += heapobj-malloc.c +libcopperplate@CORE@_la_SOURCES += heapobj-malloc.c endif endif@@ -62,6 +62,6 @@ DIST_SUBDIRS = regd SPARSE = sparse sparse: - @for i in $(libcopperplate_la_SOURCES) ; do \ + @for i in $(libcopperplate@CORE@_la_SOURCES) ; do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/copperplate/regd/Makefile.am +1
-1@@ -9,7 +9,7 @@ CPPFLAGS = \ LDFLAGS = $(XENO_POSIX_WRAPPERS) LDADD = \ - ../libcopperplate.la \ + ../libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtlib/psos/Makefile.am +7
-7@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libpsos.la +lib_LTLIBRARIES = libpsos@[email protected] -libpsos_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libpsos@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libpsos_la_LIBADD = \ +libpsos@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libpsos_la_SOURCES = \ +libpsos@CORE@_la_SOURCES = \ init.c \ internal.h \ pt.c \@@ -23,7 +23,7 @@ libpsos_la_SOURCES = \ tm.h \ reference.h -libpsos_la_CPPFLAGS = \ +libpsos@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -33,6 +33,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libpsos_la_SOURCES); do \ + @for i in $(libpsos@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/smokey/Makefile.am +5
-5@@ -1,13 +1,13 @@ -lib_LTLIBRARIES = libsmokey.la +lib_LTLIBRARIES = libsmokey@[email protected] -libsmokey_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libsmokey_la_LIBADD = @XENO_CORE_LDADD@ +libsmokey@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libsmokey@CORE@_la_LIBADD = @XENO_CORE_LDADD@ -libsmokey_la_SOURCES = \ +libsmokey@CORE@_la_SOURCES = \ helpers.c \ init.c -libsmokey_la_CPPFLAGS = \ +libsmokey@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/liblib/trank/Makefile.am +6
-6@@ -1,20 +1,20 @@ -lib_LTLIBRARIES = libtrank.la +lib_LTLIBRARIES = libtrank@[email protected] -libtrank_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libtrank@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libtrank_la_LIBADD = \ +libtrank@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/alchemy/libalchemy.la + $(top_builddir)/lib/alchemy/libalchemy@[email protected] -libtrank_la_SOURCES = \ +libtrank@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \ posix.c \ native.c -libtrank_la_CPPFLAGS = \ +libtrank@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -D__XENO_COMPAT__ \ -I$(top_srcdir)/include \lib/vxworks/Makefile.am +7
-7@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libvxworks.la +lib_LTLIBRARIES = libvxworks@[email protected] -libvxworks_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libvxworks@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libvxworks_la_LIBADD = \ +libvxworks@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libvxworks_la_SOURCES = \ +libvxworks@CORE@_la_SOURCES = \ init.c \ errnoLib.c \ intLib.c \@@ -32,7 +32,7 @@ libvxworks_la_SOURCES = \ sysLib.c \ reference.h -libvxworks_la_CPPFLAGS = \ +libvxworks@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -42,6 +42,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libvxworks_la_SOURCES); do \ + @for i in $(libvxworks@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donescripts/xeno-config-cobalt.in +3
-2@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"@@ -264,8 +265,8 @@ if test x$do_ldflags = xy; then # --[no-]mode-check does. ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="$ldflags -l$skin" + copperplate="-lcopperplate$core" + ldflags="$ldflags -l$skin$core" if [ -r ${XENO_LIBRARY_DIR}/${skin}.wrappers ]; then ldflags=" `dump_wrappers ${skin}.wrappers` $ldflags" fiscripts/xeno-config-mercury.in +3
-2@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"@@ -195,8 +196,8 @@ if test x$do_ldflags = xy; then posix|rtdm) ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="-l$skin $ldflags" + copperplate="-lcopperplate$core" + ldflags="-l$skin$core $ldflags" ;; *) echo "unknown API: $skin" 1>&2testsuite/gpiotest/Makefile.am +1
-1@@ -13,7 +13,7 @@ gpiotest_CPPFLAGS = \ gpiotest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) gpiotest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrttestsuite/smokey/Makefile.am +2
-2@@ -110,8 +110,8 @@ smokey_LDFLAGS=$(wrappers) @XENO_AUTOINIT_LDFLAGS@ $(undef_list) smokey_LDADD = \ $(plugin_list) \ - ../../lib/smokey/libsmokey.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/smokey/libsmokey@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrttestsuite/smokey/dlopen/Makefile.am +3
-3@@ -11,8 +11,8 @@ libalchemy_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] libalchemy_test_la_SOURCES = libalchemy-test.c@@ -29,7 +29,7 @@ libposix_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/copperplate/libcopperplate@[email protected] libposix_test_la_SOURCES = libposix-test.ctestsuite/spitest/Makefile.am +1
-1@@ -13,7 +13,7 @@ spitest_CPPFLAGS = \ spitest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) spitest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtutils/analogy/Makefile.am +4
-4@@ -42,8 +42,8 @@ cmd_read_SOURCES = cmd_read.c cmd_read_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lm@@ -52,8 +52,8 @@ cmd_write_SOURCES = cmd_write.c cmd_write_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lmutils/can/Makefile.am +4
-4@@ -20,8 +20,8 @@ rtcanconfig_LDADD = \ rtcanrecv_SOURCES = rtcanrecv.c rtcanrecv_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt@@ -29,8 +29,8 @@ rtcanrecv_LDADD = \ rtcansend_SOURCES = rtcansend.c rtcansend_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtutils/hdb/Makefile.am +1
-1@@ -9,7 +9,7 @@ hdb_CPPFLAGS = \ hdb_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ hdb_LDADD = \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtSignature · 1 line
2.21.0
Quoted 8 lines · Vitaly Chikunov
Quoted 3 lines · Vitaly Chikunov
This will allow (for users) installing both versions of libs into the same system and (for distributions) having them without conflicts in the same repository.
I forgot we need to install
xeno_config.hsomewhere somehow. Otherwise, it would be overwritten by other core.
Will that need support from Xenomai, or will you have to handle that at packaging level anyway?
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
Jan,
Quoted 6 lines · Jan Kiszka
Quoted 5 lines · Vitaly Chikunov
Quoted 3 lines · Vitaly Chikunov
This will allow (for users) installing both versions of libs into the same system and (for distributions) having them without conflicts in the same repository.
Quoted 6 lines
Quoted 3 lines
I forgot we need to install
xeno_config.hsomewhere somehow. Otherwise, it would be overwritten by other core.Will that need support from Xenomai, or will you have to handle that at packaging level anyway?
First I thought only solution would be to have separate include dirs for Cobalt and Mercury. But, then I noticed that XENO_BASE_CFLAGS in xeno-config-s have:
XENO_BASE_CFLAGS="-I$XENO_INCLUDE_DIR/cobalt -I$XENO_INCLUDE_DIR @XENO_USER_APP_CFLAGS@ -D__COBALT__" XENO_BASE_CFLAGS="-I$XENO_INCLUDE_DIR/mercury -I$XENO_INCLUDE_DIR @XENO_USER_APP_CFLAGS@ -D__MERCURY__"
Thus, we could keep common include dir, but move corresponding xeno_config.h into cobalt/ and mercury/ subdirs. I can have this in spec so Xenomai not need to be changed.
Quoted 6 lines
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
Quoted 54 lines · Vitaly Chikunov
This will allow (for users) installing both versions of libs into the same system and (for distributions) having them without conflicts in the same repository.
Such script is used to change Makefile.am-s:
for lib in copperplate alchemy psos smokey trank vxworks do
find -name Makefile.am \ | xargs -r \ sed -i -e "s/lib${lib}\.la/lib${lib}@CORE@\.la/g" \ -e "s/lib${lib}\_la/lib${lib}@CORE@\_la/g"done
Signed-off-by Vitaly Chikunov <[email protected]>--- configure.ac | 7 +++++++ demo/alchemy/Makefile.am | 4 ++-- demo/alchemy/cobalt/Makefile.am | 4 ++-- lib/alchemy/Makefile.am | 16 ++++++++-------- lib/copperplate/Makefile.am | 24 ++++++++++++------------ lib/copperplate/regd/Makefile.am | 2 +- lib/psos/Makefile.am | 14 +++++++------- lib/smokey/Makefile.am | 10 +++++----- lib/trank/Makefile.am | 12 ++++++------ lib/vxworks/Makefile.am | 14 +++++++------- scripts/xeno-config-cobalt.in | 5 +++-- scripts/xeno-config-mercury.in | 5 +++-- testsuite/gpiotest/Makefile.am | 2 +- testsuite/smokey/Makefile.am | 4 ++-- testsuite/smokey/dlopen/Makefile.am | 6 +++--- testsuite/spitest/Makefile.am | 2 +- utils/analogy/Makefile.am | 8 ++++---- utils/can/Makefile.am | 8 ++++---- utils/hdb/Makefile.am | 2 +- 19 files changed, 79 insertions(+), 70 deletions(-)configure.ac +5
-0@@ -859,6 +859,11 @@ dnl in-tree executables which require POSIX symbol wrapping. AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ["$modechk_wrappers $cobalt_wrappers"]) fi +dnl Multi-core support. +if test $rtcore_type = mercury; then + CORE="_$rtcore_type" +fi + dnl dnl Build the Makefiles dnl
configure.ac AC_SUBST(XENO_TEST_DIR) · line 906
Quoted 4 lines
configure.ac +1
-0@@ -898,6 +903,8 @@ AC_SUBST(XENO_TEST_DIR) AC_SUBST(XENO_DEMO_DIR) AC_SUBST(XENO_BUILD_COMPILER) AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(XENO_BUILD_ARGS)
Duplication. Did you intended something else?
Quoted 465 lines
configure.ac +1
-0+AC_SUBST(CORE) AC_CONFIG_FILES([ \ Makefile \demo/alchemy/Makefile.am +2
-2@@ -11,8 +11,8 @@ cppflags = \ -I$(top_srcdir)/include ldadd = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt -lmdemo/alchemy/cobalt/Makefile.am +2
-2@@ -11,8 +11,8 @@ cppflags = \ ldadd = \ @XENO_AUTOINIT_LDFLAGS@ \ $(XENO_POSIX_WRAPPERS) \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la \ + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lmlib/alchemy/Makefile.am +8
-8@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libalchemy.la +lib_LTLIBRARIES = libalchemy@[email protected] -libalchemy_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libalchemy@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libalchemy_la_LIBADD = \ +libalchemy@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libalchemy_la_SOURCES = \ +libalchemy@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \@@ -33,12 +33,12 @@ libalchemy_la_SOURCES = \ timer.h if XENO_COBALT -libalchemy_la_SOURCES += \ +libalchemy@CORE@_la_SOURCES += \ pipe.c \ pipe.h endif -libalchemy_la_CPPFLAGS = \ +libalchemy@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -48,6 +48,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libalchemy_la_SOURCES); do \ + @for i in $(libalchemy@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/copperplate/Makefile.am +12
-12@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libcopperplate.la +lib_LTLIBRARIES = libcopperplate@[email protected] -libcopperplate_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 -libcopperplate_la_LIBADD = @XENO_CORE_LDADD@ +libcopperplate@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -lpthread -lrt -version-info 0:0:0 +libcopperplate@CORE@_la_LIBADD = @XENO_CORE_LDADD@ noinst_LTLIBRARIES = -libcopperplate_la_SOURCES = \ +libcopperplate@CORE@_la_SOURCES = \ clockobj.c \ cluster.c \ eventobj.c \@@ -19,35 +19,35 @@ libcopperplate_la_SOURCES = \ timerobj.c \ traceobj.c -libcopperplate_la_CPPFLAGS = \ +libcopperplate@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib if XENO_REGISTRY -libcopperplate_la_LIBADD += libregistry.la +libcopperplate@CORE@_la_LIBADD += libregistry.la noinst_LTLIBRARIES += libregistry.la libregistry_la_SOURCES = registry.c libregistry_la_CPPFLAGS = \ - $(libcopperplate_la_CPPFLAGS) \ + $(libcopperplate@CORE@_la_CPPFLAGS) \ @XENO_FUSE_CFLAGS@ endif if XENO_PSHARED # The process shareable heap has real-time properties, therefore it # fits both the cobalt and mercury cores equally. Yummie. -libcopperplate_la_SOURCES += heapobj-pshared.c reference.c +libcopperplate@CORE@_la_SOURCES += heapobj-pshared.c reference.c endif if XENO_TLSF -libcopperplate_la_SOURCES += heapobj-tlsf.c +libcopperplate@CORE@_la_SOURCES += heapobj-tlsf.c else if XENO_HEAPMEM -libcopperplate_la_SOURCES += heapobj-heapmem.c +libcopperplate@CORE@_la_SOURCES += heapobj-heapmem.c else -libcopperplate_la_SOURCES += heapobj-malloc.c +libcopperplate@CORE@_la_SOURCES += heapobj-malloc.c endif endif@@ -62,6 +62,6 @@ DIST_SUBDIRS = regd SPARSE = sparse sparse: - @for i in $(libcopperplate_la_SOURCES) ; do \ + @for i in $(libcopperplate@CORE@_la_SOURCES) ; do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/copperplate/regd/Makefile.am +1
-1@@ -9,7 +9,7 @@ CPPFLAGS = \ LDFLAGS = $(XENO_POSIX_WRAPPERS) LDADD = \ - ../libcopperplate.la \ + ../libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtlib/psos/Makefile.am +7
-7@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libpsos.la +lib_LTLIBRARIES = libpsos@[email protected] -libpsos_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libpsos@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libpsos_la_LIBADD = \ +libpsos@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libpsos_la_SOURCES = \ +libpsos@CORE@_la_SOURCES = \ init.c \ internal.h \ pt.c \@@ -23,7 +23,7 @@ libpsos_la_SOURCES = \ tm.h \ reference.h -libpsos_la_CPPFLAGS = \ +libpsos@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -33,6 +33,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libpsos_la_SOURCES); do \ + @for i in $(libpsos@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donelib/smokey/Makefile.am +5
-5@@ -1,13 +1,13 @@ -lib_LTLIBRARIES = libsmokey.la +lib_LTLIBRARIES = libsmokey@[email protected] -libsmokey_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libsmokey_la_LIBADD = @XENO_CORE_LDADD@ +libsmokey@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libsmokey@CORE@_la_LIBADD = @XENO_CORE_LDADD@ -libsmokey_la_SOURCES = \ +libsmokey@CORE@_la_SOURCES = \ helpers.c \ init.c -libsmokey_la_CPPFLAGS = \ +libsmokey@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/liblib/trank/Makefile.am +6
-6@@ -1,20 +1,20 @@ -lib_LTLIBRARIES = libtrank.la +lib_LTLIBRARIES = libtrank@[email protected] -libtrank_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libtrank@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libtrank_la_LIBADD = \ +libtrank@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/alchemy/libalchemy.la + $(top_builddir)/lib/alchemy/libalchemy@[email protected] -libtrank_la_SOURCES = \ +libtrank@CORE@_la_SOURCES = \ init.c \ internal.c \ internal.h \ posix.c \ native.c -libtrank_la_CPPFLAGS = \ +libtrank@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -D__XENO_COMPAT__ \ -I$(top_srcdir)/include \lib/vxworks/Makefile.am +7
-7@@ -1,12 +1,12 @@ -lib_LTLIBRARIES = libvxworks.la +lib_LTLIBRARIES = libvxworks@[email protected] -libvxworks_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 +libvxworks@CORE@_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0 -libvxworks_la_LIBADD = \ +libvxworks@CORE@_la_LIBADD = \ @XENO_CORE_LDADD@ \ - $(top_builddir)/lib/copperplate/libcopperplate.la + $(top_builddir)/lib/copperplate/libcopperplate@[email protected] -libvxworks_la_SOURCES = \ +libvxworks@CORE@_la_SOURCES = \ init.c \ errnoLib.c \ intLib.c \@@ -32,7 +32,7 @@ libvxworks_la_SOURCES = \ sysLib.c \ reference.h -libvxworks_la_CPPFLAGS = \ +libvxworks@CORE@_la_CPPFLAGS = \ @XENO_USER_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib@@ -42,6 +42,6 @@ EXTRA_DIST = testsuite SPARSE = sparse sparse: - @for i in $(libvxworks_la_SOURCES); do \ + @for i in $(libvxworks@CORE@_la_SOURCES); do \ $(SPARSE) $(CHECKFLAGS) $(srcdir)/$$i; \ donescripts/xeno-config-cobalt.in +3
-2@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"@@ -264,8 +265,8 @@ if test x$do_ldflags = xy; then # --[no-]mode-check does. ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="$ldflags -l$skin" + copperplate="-lcopperplate$core" + ldflags="$ldflags -l$skin$core" if [ -r ${XENO_LIBRARY_DIR}/${skin}.wrappers ]; then ldflags=" `dump_wrappers ${skin}.wrappers` $ldflags" fiscripts/xeno-config-mercury.in +3
-2@@ -8,6 +8,7 @@ datarootdir="@datarootdir@" datadir="@datadir@" pkgdatadir="${datadir}/@PACKAGE@" includedir="@includedir@" +core="@CORE@" XENO_VERSION="@PACKAGE_VERSION@" XENO_PREFIX="${staging}${prefix}"@@ -195,8 +196,8 @@ if test x$do_ldflags = xy; then posix|rtdm) ;; vxworks|psos|alchemy|smokey) - copperplate="-lcopperplate" - ldflags="-l$skin $ldflags" + copperplate="-lcopperplate$core" + ldflags="-l$skin$core $ldflags" ;; *) echo "unknown API: $skin" 1>&2testsuite/gpiotest/Makefile.am +1
-1@@ -13,7 +13,7 @@ gpiotest_CPPFLAGS = \ gpiotest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) gpiotest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrttestsuite/smokey/Makefile.am +2
-2@@ -110,8 +110,8 @@ smokey_LDFLAGS=$(wrappers) @XENO_AUTOINIT_LDFLAGS@ $(undef_list) smokey_LDADD = \ $(plugin_list) \ - ../../lib/smokey/libsmokey.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/smokey/libsmokey@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrttestsuite/smokey/dlopen/Makefile.am +3
-3@@ -11,8 +11,8 @@ libalchemy_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/alchemy/libalchemy.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/alchemy/libalchemy@[email protected] \ + ../../../lib/copperplate/libcopperplate@[email protected] libalchemy_test_la_SOURCES = libalchemy-test.c@@ -29,7 +29,7 @@ libposix_test_la_LIBADD = \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ ../../../lib/boilerplate/init/libbootstrap-pic.la \ - ../../../lib/copperplate/libcopperplate.la + ../../../lib/copperplate/libcopperplate@[email protected] libposix_test_la_SOURCES = libposix-test.ctestsuite/spitest/Makefile.am +1
-1@@ -13,7 +13,7 @@ spitest_CPPFLAGS = \ spitest_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ $(XENO_POSIX_WRAPPERS) spitest_LDADD = \ - ../../lib/smokey/libsmokey.la \ + ../../lib/smokey/libsmokey@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtutils/analogy/Makefile.am +4
-4@@ -42,8 +42,8 @@ cmd_read_SOURCES = cmd_read.c cmd_read_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lm@@ -52,8 +52,8 @@ cmd_write_SOURCES = cmd_write.c cmd_write_LDADD = \ @XENO_AUTOINIT_LDFLAGS@ \ ../../lib/analogy/libanalogy.la \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lrt -lpthread -lmutils/can/Makefile.am +4
-4@@ -20,8 +20,8 @@ rtcanconfig_LDADD = \ rtcanrecv_SOURCES = rtcanrecv.c rtcanrecv_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt@@ -29,8 +29,8 @@ rtcanrecv_LDADD = \ rtcansend_SOURCES = rtcansend.c rtcansend_LDADD = \ - ../../lib/alchemy/libalchemy.la \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/alchemy/libalchemy@[email protected] \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrtutils/hdb/Makefile.am +0
-0
utils/hdb/Makefile.am hdb_CPPFLAGS = \ · line 15
Quoted 8 lines
utils/hdb/Makefile.am +1
-1@@ -9,7 +9,7 @@ hdb_CPPFLAGS = \ hdb_LDFLAGS = @XENO_AUTOINIT_LDFLAGS@ hdb_LDADD = \ - ../../lib/copperplate/libcopperplate.la \ + ../../lib/copperplate/libcopperplate@[email protected] \ @XENO_CORE_LDADD@ \ @XENO_USER_LDADD@ \ -lpthread -lrt
Ok, so this renames things for mercury unconditionally. If I merged that into master, which is still == stable 3.1, it would break current users because their dependencies would suddently be renamed.
Would it makes sense to do the renaming as opt-in for now? We could change that for 3.2.
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
Jan,
Quoted 8 lines · Jan Kiszka
configure.ac AC_SUBST(XENO_TEST_DIR) · line 906
Quoted 5 lines · Vitaly Chikunov
configure.ac +1
-0@@ -898,6 +903,8 @@ AC_SUBST(XENO_TEST_DIR) AC_SUBST(XENO_DEMO_DIR) AC_SUBST(XENO_BUILD_COMPILER) AC_SUBST(XENO_BUILD_ARGS) +AC_SUBST(XENO_BUILD_ARGS)Duplication. Did you intended something else?
Accidental.
Quoted 3 lines
Ok, so this renames things for mercury unconditionally. If I merged that into master, which is still == stable 3.1, it would break current users because their dependencies would suddently be renamed.
OK, I will add some option, like --so-suffix.
Thanks,
Quoted 9 lines
Would it makes sense to do the renaming as opt-in for now? We could change that for 3.2.
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux