diff options
Diffstat (limited to 'recipes-devtools')
4 files changed, 41 insertions, 38 deletions
diff --git a/recipes-devtools/fossology/fossology-nomos-native_git.bb b/recipes-devtools/fossology/fossology-nomos-native_git.bb index 2f55ed1..e034a34 100644 --- a/recipes-devtools/fossology/fossology-nomos-native_git.bb +++ b/recipes-devtools/fossology/fossology-nomos-native_git.bb @@ -4,11 +4,13 @@ SECTION = "devel/python" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GenCodeCopyright;md5=7296ec131dbd040718b64fb843d63048" -DEPENDS = "glib-2.0-native" +DEPENDS = "glib-2.0-native libpcre-native" SRCREV = "34467fd530b832f08c095936a72c22c40fa13278" BRANCH = "release/${PV}/master" -SRC_URI = "git://github.com/fossology/fossology.git" +SRC_URI = "git://github.com/fossology/fossology.git \ + file://0001-Add-rpath-to-fix-error-as-following.patch \ + " S = "${WORKDIR}/git/src/nomos/agent" diff --git a/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch b/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch new file mode 100644 index 0000000..4052b1c --- /dev/null +++ b/recipes-devtools/fossology/fossology-nomos/0001-Add-rpath-to-fix-error-as-following.patch @@ -0,0 +1,28 @@ +From b81cced8566406c85b38a1c3c71858982a3dd4a5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 1 Mar 2017 10:23:03 +0900 +Subject: [PATCH] Add rpath to fix error as following: + +/usr/bin/ld: warning: libpcre.so.1, needed by tmp/sysroots/x86_64-linux/usr/lib/libglib-2.0.so, not found (try using -rpath or -rpath-link) + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +--- + Makefile.sa | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.sa b/Makefile.sa +index 24a16ca..f39bdd6 100644 +--- a/Makefile.sa ++++ b/Makefile.sa +@@ -26,7 +26,7 @@ all: encode nomos + debug: nomos-gl + + nomos: nomos.o $(OBJS) $(GENOBJS) +- $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) ++ $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) -Wl,-rpath,${libdir} + + nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) + $(CC) -c $< $(CFLAGS_LOCAL) $(DEFS) +-- +1.8.4.2 + diff --git a/recipes-devtools/python/python-dosocs2-native_0.16.1.bb b/recipes-devtools/python/python-dosocs2-native_0.16.1.bb index 60f3029..2c7f124 100644 --- a/recipes-devtools/python/python-dosocs2-native_0.16.1.bb +++ b/recipes-devtools/python/python-dosocs2-native_0.16.1.bb @@ -18,8 +18,15 @@ S = "${WORKDIR}/DoSOCSv2-${PV}/" inherit distutils native -DEPENDS += "python-jinja2-native python-native" -DEPENDS += "python-psycopg2-native python-docopt-native python-sqlalchemy-native file-native" +DEPENDS += "python-jinja2-native \ + python-native \ + python-psycopg2-native \ + python-docopt-native \ + python-sqlalchemy-native \ + file-native \ + fossology-nomos-native \ + python-markupsafe-native \ + python-magic-native " python do_dosocs2_init(){ import os diff --git a/recipes-devtools/python/python-dosocs2-natives b/recipes-devtools/python/python-dosocs2-natives deleted file mode 100644 index 41f6bb2..0000000 --- a/recipes-devtools/python/python-dosocs2-natives +++ /dev/null @@ -1,34 +0,0 @@ -From d282ba074625922d12615af676ac1f0e922db88f Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 15 Feb 2017 23:23:53 +0900 -Subject: [PATCH] setup.py: delete the depends install - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 527b161..b35863f 100644 ---- a/setup.py -+++ b/setup.py -@@ -3,16 +3,9 @@ from setuptools import setup - _dosocs2_version = '0.16.1' - - install_requires=[ -- 'jinja2', -- 'python-magic', -- 'docopt', -- 'SQLAlchemy', -- 'psycopg2' - ] - - tests_require=[ -- 'pytest', -- 'mock' - ] - - setup( --- -1.8.4.2 - |