Skip to contentSkip to conversation

libnl: don't patch libnl-3.0.pc

PATCH In review Ross Burton 2 participants 2 messages Sep 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libnl: don't patch libnl-3.0.pc

This patch originally came from oe-classic in 2010 with the comment "fix pc file so that it actually links to the support libraries". If an application wants to link to the support libraries then it should be using the relevant .pc files to do so.

oe-core builds successfully with this patch removed and other distributions don't carry it, so drop the patch.

---
 .../libnl/libnl/fix-pc-file.patch               | 17 -----------------
 meta/recipes-support/libnl/libnl_3.5.0.bb       |  9 +++------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-support/libnl/libnl/fix-pc-file.patch
meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted +0 -17
deleted file mode 100644
index fe8b833a1ce..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Some packages are asking only for libnl-2.0, but expects to get also
-libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
-
-Signed-off-by: Martin Jansa <[email protected]>
-Index: libnl-3.2.14/libnl-3.0.pc.in
-===================================================================
---- libnl-3.2.14.orig/libnl-3.0.pc.in
-+++ libnl-3.2.14/libnl-3.0.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: libnl
- Description: Convenience library for netlink sockets
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnl-@MAJ_VERSION@
-+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
- Cflags: -I${includedir}/libnl@MAJ_VERSION@
meta/recipes-support/libnl/libnl_3.5.0.bb +3 -6
index e6a225af525..c0609c4d900 100644
@@ -9,15 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 DEPENDS = "flex-native bison-native"
 
-SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
-           file://fix-pc-file.patch \
-"
-
-UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
-
+SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz"
 SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4"
 SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
 
+UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
+
 inherit autotools pkgconfig
 
 FILES_${PN} = "${libdir}/libnl-3.so.* \
Signature · 1 line
2.20.1
#1 lore raw

✗ patchtest: failure for libnl: don't patch libnl-3.0.pc

== Series Details ==

Series: libnl: don't patch libnl-3.0.pc
Revision: 1
URL : https://patchwork.openembedded.org/series/19665/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at aa36510ebe)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe