[oe-commits] [openembedded-core] 05/11: libnl: don't patch libnl-3.0.pc

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 860b752d8901c69fb2165e1944396013476ced50
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Sep 3 12:19:21 2019 +0100

    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 <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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(-)

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 fe8b833..0000000
--- 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 <martin.jansa at gmail.com>
-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- at MAJ_VERSION@
-+Libs: -L${libdir} -lnl- at MAJ_VERSION@ -lnl-genl- at MAJ_VERSION@ -lnl-nf- at MAJ_VERSION@ -lnl-route- at MAJ_VERSION@
- Cflags: -I${includedir}/libnl at 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 e6a225a..c0609c4 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.* \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.