Sorry, this was already merged and tested. You'd have to drop the local patch once you get it integrated into the makefile.
Denys On Thu, Jun 06, 2019 at 07:15:53PM +0000, Xu, Jianzhong wrote: > NAK. > > I will fix the makefile in the source (confirmed with Jake). > > Thanks, > Jianzhong > > -----Original Message----- > From: Stiffler, Jacob > Sent: Thursday, June 06, 2019 12:05 PM > To: [email protected] > Cc: Xu, Jianzhong; Stiffler, Jacob > Subject: [thud/master][PATCH v2] tidl-import: disable static linking > > * Disable static linking to fix run-time against protobuf 3.6.1 > > Signed-off-by: Jacob Stiffler <[email protected]> > --- > v2 changes: drop FILESEXTRAPATHS > > .../tidl-utils/tidl-import/disable_static.patch | 16 > ++++++++++++++++ > .../recipes-ti/tidl-utils/tidl-import_git.bb | 4 +++- > 2 files changed, 19 insertions(+), 1 deletion(-) > create mode 100644 > meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch > > diff --git > a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch > b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch > new file mode 100644 > index 0000000..23377af > --- /dev/null > +++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch > @@ -0,0 +1,16 @@ > +diff --git a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile > b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile > +index 374f862..521f0dc 100644 > +--- a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile > ++++ b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile > +@@ -103,9 +103,9 @@ ifeq ($(PLATFORM_BUILD), x86) > + ifeq ($(LINUX_IMPORT_TOOL), 64BIT) > + CFLAGS+= -DPLATFORM_64BIT > + endif > +-LDFLAGS+= -lstdc++ -static > ++LDFLAGS+= -lstdc++ > + else > +-LDFLAGS+= -lstdc++ -lz -static > ++LDFLAGS+= -lstdc++ -lz > + endif > + endif > + > diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb > b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb > index bef2d1a..9f1c5bb 100644 > --- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb > +++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb > @@ -8,7 +8,9 @@ LICENSE = "BSD-3" > LIC_FILES_CHKSUM = > "file://modules/ti_dl/inc/itidl_ti.h;beginline=1;endline=34;md5=cabe1fdaabfa0d85dc5544566b0e2425" > > PV = "01.01.00.00" > -PR = "r0" > +PR = "r1" > + > +SRC_URI_append = " file://disable_static.patch;pnum=3" > > S = "${WORKDIR}/git/src/importTool/" > > -- > 2.7.4 > > _______________________________________________ > 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
