diff mbox series

[meta-oe,3/5] libleak: Upgrade to 0.3.6

Message ID 20230527013632.96030-3-raj.khem@gmail.com
State New
Headers show
Series [meta-networking,1/5] ipvsadm: Pass build environment cflags to compiler | expand

Commit Message

Khem Raj May 27, 2023, 1:36 a.m. UTC
Do not overwrite cflags when calling make on libwuya

Fixes
WARNING: libleak-1.0+gitAUTOINC+ea2bb608ae-r0 do_package_qa: QA Issue: File /usr/lib/.debug/libleak.so in package libleak-dbg contains reference to TMPDIR [buildpaths]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-respect-environment-variables.patch        | 13 ++++++-------
 .../libleak/{libleak_git.bb => libleak_0.3.6.bb}    |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-extended/libleak/{libleak_git.bb => libleak_0.3.6.bb} (92%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch b/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch
index bbdfa3c960..979fd323ae 100644
--- a/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch
+++ b/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch
@@ -8,18 +8,17 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 1d70f17..c7e726e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,8 +1,8 @@
 -CFLAGS = -g -O2 -Wall -fPIC -Ilibwuya
 -LDFLAGS = -Llibwuya
 +CFLAGS += -g -O2 -Wall -fPIC -Ilibwuya
 +LDFLAGS += -Llibwuya
  
  libleak.so: libleak.o
- 	CFLAGS='-fPIC' make -C libwuya
--- 
-2.30.1
-
+-	CFLAGS='-fPIC' make -C libwuya
++	make -C libwuya
+ 	$(CC) -shared -o $@ $^ $(LDFLAGS) -lwuya -lpthread -ldl -lbacktrace
+ 
+ clean:
diff --git a/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
similarity index 92%
rename from meta-oe/recipes-extended/libleak/libleak_git.bb
rename to meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
index a83a11c684..e3e4c01acb 100644
--- a/meta-oe/recipes-extended/libleak/libleak_git.bb
+++ b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
@@ -8,13 +8,12 @@  LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb
 
 DEPENDS += "libbacktrace"
 
+PE = "1"
+SRCREV = "1c56b0a2ba643db976f589ec04b246e693b6c0ce"
 SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \
            file://0001-respect-environment-variables.patch \
           "
 
-PV = "1.0+git${SRCPV}"
-SRCREV = "ea2bb608ae25701692269a37d39d77e966b887ac"
-
 S = "${WORKDIR}/git"
 
 do_configure () {