From f4a544f46e2a58e64e90d92855d1d85966eefa10 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Sep 2019 12:19:21 +0100 Subject: 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/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 (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index fe8b833a1c..0000000000 --- a/meta/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null @@ -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 -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@ diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb index e6a225af52..c0609c4d90 100644 --- a/meta/recipes-support/libnl/libnl_3.5.0.bb +++ b/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -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.* \ -- cgit 1.2.3-korg