Denys, Please backport to ti2019.05.
Thank you, Jake -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Zhao (Compiler), Yuan Sent: Thursday, December 12, 2019 6:46 PM To: [email protected] Subject: [EXTERNAL] [meta-arago] [master/thud/ti2019.05][PATCH v2] tidl-api: fix package-qa issues - by putting SONAME in built shared libraries. Signed-off-by: Yuan Zhao <[email protected]> --- .../0001-Fix-versioning-for-shared-libary.patch | 55 ++++++++++++++++++++++ .../recipes-ti/tidl-api/tidl-api_git.bb | 6 ++- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch diff --git a/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch b/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch new file mode 100644 index 00000000..d15389b8 --- /dev/null +++ b/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch @@ -0,0 +1,55 @@ +tidl-api: Fix versioning for shared libary + + SONAME needs to be properly set up in the generated shared library. + +Upstream-Status: Submitted + +Signed-off-by: Yuan Zhao <[email protected]> +--- + tidl_api/Makefile | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/tidl_api/Makefile b/tidl_api/Makefile +index a04e604..3a5ea69 100644 +--- a/tidl_api/Makefile ++++ b/tidl_api/Makefile +@@ -37,6 +37,8 @@ all: $(LIB_NAME) $(LIB_IMGUTIL_NAME) $(PY_LIB_NAME) \ + include make.inc + include make.buildid + ++SO_VER=$(MAJOR_VER).$(MINOR_VER).$(PATCH_VER) ++ + RM = rm + AR = ar + +@@ -95,7 +97,10 @@ $(LIB_NAME): $(HOST_OBJ_FILES) + $(AR) cr $@ $(HOST_OBJ_FILES) + + $(SHARED_LIB_NAME): $(HOST_OBJ_FILES) +- $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -lOpenCL $(HOST_OBJ_FILES) -o $@ ++ $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -Wl,-soname,$@.$(MAJOR_VER) \ ++ -lOpenCL $(HOST_OBJ_FILES) -o $@.$(SO_VER) ++ ln -sf $@.$(SO_VER) $@.$(MAJOR_VER) ++ ln -sf $@.$(MAJOR_VER) $@ + + $(PY_LIB_NAME): $(HOST_OBJ_PYBIND_FILES) $(LIB_NAME) + $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -lOpenCL -locl_util $^ -o $@ +@@ -104,10 +109,14 @@ $(LIB_IMGUTIL_NAME): $(HOST_OBJ_IMGUTIL_FILES) + $(AR) cr $@ $(HOST_OBJ_IMGUTIL_FILES) + + $(SHARED_LIB_IMGUTIL_NAME): $(HOST_OBJ_IMGUTIL_FILES) +- $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared $(HOST_OBJ_IMGUTIL_FILES) -o $@ ++ $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -Wl,-soname,$@.$(MAJOR_VER) \ ++ $(HOST_OBJ_IMGUTIL_FILES) -o $@.$(SO_VER) ++ ln -sf $@.$(SO_VER) $@.$(MAJOR_VER) ++ ln -sf $@.$(MAJOR_VER) $@ + + clean:: + $(RM) -f $(LIB_NAME) $(PY_LIB_NAME) + $(RM) -f $(LIB_IMGUTIL_NAME) ++ $(RM) -f $(SHARED_LIB_NAME)* $(SHARED_LIB_IMGUTIL_NAME)* + $(RM) -rf obj + +-- +2.17.1 + diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb index a8829c1b..c96fa337 100644 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb @@ -6,7 +6,8 @@ LICENSE = "BSD" include tidl-api.inc require recipes-ti/includes/ti-paths.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" +SRC_URI += "file://0001-Fix-versioning-for-shared-libary.patch" COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -42,10 +43,11 @@ do_install() { install -d ${D}${TIDL_INSTALL_DIR}/tidl_api install -d ${D}${TIDL_INSTALL_DIR}/viewer install -d ${D}${libdir} + cp ${CP_ARGS} ${S}/tidl_api/libtidl_*.so* ${D}${libdir} + rm -f ${S}/tidl_api/libtidl_*.so* cp ${CP_ARGS} ${S}/tidl_api/* ${D}${TIDL_INSTALL_DIR}/tidl_api/ cp ${CP_ARGS} ${S}/viewer/* ${D}${TIDL_INSTALL_DIR}/viewer/ install ${S}/readme.md ${D}${TIDL_INSTALL_DIR}/ - cp ${CP_ARGS} ${S}/tidl_api/libtidl_*.so ${D}${libdir} } FILES_${PN} += "\ -- 2.14.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
