Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 659254 Details for
Bug 741400
dev-libs/libbpf: ebuild cleanup
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Remove static-libs USE flag, simplify ebuild
libbpf-cleanup.patch (text/plain), 7.08 KB, created by
Jakov Smolić
on 2020-09-09 11:42:03 UTC
(
hide
)
Description:
Remove static-libs USE flag, simplify ebuild
Filename:
MIME Type:
Creator:
Jakov Smolić
Created:
2020-09-09 11:42:03 UTC
Size:
7.08 KB
patch
obsolete
>From cc0c0292e28c1c5eeb0960b3032bf93a36745a3f Mon Sep 17 00:00:00 2001 >From: Jakov Smolic <jakov.smolic@sartura.hr> >Date: Fri, 4 Sep 2020 10:37:51 +0200 >Subject: [PATCH] dev-libs/libbpf: ebuild cleanup > >- Remove static-libs USE flag. Makefile does not support the 'BUILD_STATIC' >variable. Only option available is to install only static libraries, so install shared and >static libraries uncoditionally. >- Do not install uapi headers as they are provided by linux-headers >package. >- Set environment variables. > >Package-Manager: Portage-3.0.4, Repoman-3.0.1 >Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> >--- > .../libbpf/files/libbpf-0.0.5-paths.patch | 38 ------------------- > dev-libs/libbpf/files/libbpf-9999-paths.patch | 38 ------------------- > ...0.0.9-r1.ebuild => libbpf-0.0.9-r2.ebuild} | 23 ++--------- > ...0.1.0-r1.ebuild => libbpf-0.1.0-r2.ebuild} | 27 ++----------- > dev-libs/libbpf/libbpf-9999.ebuild | 27 ++----------- > 5 files changed, 12 insertions(+), 141 deletions(-) > delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.5-paths.patch > delete mode 100644 dev-libs/libbpf/files/libbpf-9999-paths.patch > rename dev-libs/libbpf/{libbpf-0.0.9-r1.ebuild => libbpf-0.0.9-r2.ebuild} (60%) > rename dev-libs/libbpf/{libbpf-0.1.0-r1.ebuild => libbpf-0.1.0-r2.ebuild} (61%) > >diff --git a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch >deleted file mode 100644 >index e9eda9c2dce..00000000000 >--- a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch >+++ /dev/null >@@ -1,38 +0,0 @@ >-diff --git a/Makefile b/Makefile >-index 6992fbf..cefc77a 100644 >---- a/Makefile >-+++ b/Makefile >-@@ -64,7 +64,7 @@ endif >- PREFIX ?= /usr >- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) >- INCLUDEDIR ?= $(PREFIX)/include >--UAPIDIR ?= $(PREFIX)/include >-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi >- >- all: $(STATIC_LIBS) $(SHARED_LIBS) $(PC_FILE) >- >-@@ -85,6 +85,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) >- $(OBJDIR)/libbpf.pc: >- sed -e "s|@PREFIX@|$(PREFIX)|" \ >- -e "s|@LIBDIR@|$(LIBDIR)|" \ >-+ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ >- -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ >- < libbpf.pc.template > $@ >- >-diff --git a/libbpf.pc.template b/libbpf.pc.template >-index ac17fce..6d385d9 100644 >---- a/libbpf.pc.template >-+++ b/libbpf.pc.template >-@@ -3,10 +3,11 @@ >- prefix=@PREFIX@ >- libdir=@LIBDIR@ >- includedir=${prefix}/include >-+uapidir=@UAPIDIR@ >- >- Name: libbpf >- Description: BPF library >- Version: @VERSION@ >- Libs: -L${libdir} -lbpf >- Requires.private: libelf >--Cflags: -I${includedir} >-+Cflags: -I${includedir} -I${uapidir} >diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch >deleted file mode 100644 >index cbc267b64a3..00000000000 >--- a/dev-libs/libbpf/files/libbpf-9999-paths.patch >+++ /dev/null >@@ -1,38 +0,0 @@ >-diff --git a/Makefile b/Makefile >-index bc25aba..e1db3d6 100644 >---- a/Makefile >-+++ b/Makefile >-@@ -66,7 +66,7 @@ endif >- PREFIX ?= /usr >- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) >- INCLUDEDIR ?= $(PREFIX)/include >--UAPIDIR ?= $(PREFIX)/include >-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi >- >- TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags) >- >-@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) >- $(OBJDIR)/libbpf.pc: >- sed -e "s|@PREFIX@|$(PREFIX)|" \ >- -e "s|@LIBDIR@|$(LIBDIR)|" \ >-+ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ >- -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ >- < libbpf.pc.template > $@ >- >-diff --git a/libbpf.pc.template b/libbpf.pc.template >-index b45ed53..5ec63c2 100644 >---- a/libbpf.pc.template >-+++ b/libbpf.pc.template >-@@ -3,10 +3,11 @@ >- prefix=@PREFIX@ >- libdir=@LIBDIR@ >- includedir=${prefix}/include >-+uapidir=@UAPIDIR@ >- >- Name: libbpf >- Description: BPF library >- Version: @VERSION@ >- Libs: -L${libdir} -lbpf >- Requires.private: libelf zlib >--Cflags: -I${includedir} >-+Cflags: -I${includedir} -I${uapidir} >diff --git a/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild b/dev-libs/libbpf/libbpf-0.0.9-r2.ebuild >similarity index 60% >rename from dev-libs/libbpf/libbpf-0.0.9-r1.ebuild >rename to dev-libs/libbpf/libbpf-0.0.9-r2.ebuild >index b01f2de058d..aa9d2964ce8 100644 >--- a/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild >+++ b/dev-libs/libbpf/libbpf-0.0.9-r2.ebuild >@@ -23,26 +23,11 @@ RDEPEND="${COMMON_DEPEND}" > S="${WORKDIR}/${P}/src" > > PATCHES=( >- "${FILESDIR}/libbpf-0.0.7-paths.patch" > "${FILESDIR}/libbpf-0.0.9-fix-hashmap-on-lp32.patch" > ) > >-src_compile() { >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- CC="$(tc-getCC)" >-} >- >-src_install() { >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- DESTDIR="${D}" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- install install_uapi_headers >- >- insinto /usr/$(get_libdir)/pkgconfig >- doins ${PN}.pc >+src_configure() { >+ tc-export CC >+ export PREFIX="${EPREFIX}/usr" >+ export LIBSUBDIR="$(get_libdir)" > } >diff --git a/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild b/dev-libs/libbpf/libbpf-0.1.0-r2.ebuild >similarity index 61% >rename from dev-libs/libbpf/libbpf-0.1.0-r1.ebuild >rename to dev-libs/libbpf/libbpf-0.1.0-r2.ebuild >index 1c250842513..956721d0718 100644 >--- a/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild >+++ b/dev-libs/libbpf/libbpf-0.1.0-r2.ebuild >@@ -19,7 +19,6 @@ DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" > > LICENSE="GPL-2 LGPL-2.1 BSD-2" > SLOT="0/${PV}" >-IUSE="+static-libs" > > COMMON_DEPEND="virtual/libelf > !<=dev-util/bcc-0.7.0" >@@ -27,27 +26,9 @@ DEPEND="${COMMON_DEPEND} > sys-kernel/linux-headers" > RDEPEND="${COMMON_DEPEND}" > >-PATCHES=( >- "${FILESDIR}/libbpf-0.0.7-paths.patch" >-) >- >-src_compile() { >+src_configure() { > append-cflags -fPIC >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- CC="$(tc-getCC)" >-} >- >-src_install() { >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- DESTDIR="${D}" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- install install_uapi_headers >- >- insinto /usr/$(get_libdir)/pkgconfig >- doins ${PN}.pc >+ tc-export CC >+ export PREFIX="${EPREFIX}/usr" >+ export LIBSUBDIR="$(get_libdir)" > } >diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild >index 6697b1c3a06..956721d0718 100644 >--- a/dev-libs/libbpf/libbpf-9999.ebuild >+++ b/dev-libs/libbpf/libbpf-9999.ebuild >@@ -19,7 +19,6 @@ DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" > > LICENSE="GPL-2 LGPL-2.1 BSD-2" > SLOT="0/${PV}" >-IUSE="+static-libs" > > COMMON_DEPEND="virtual/libelf > !<=dev-util/bcc-0.7.0" >@@ -27,27 +26,9 @@ DEPEND="${COMMON_DEPEND} > sys-kernel/linux-headers" > RDEPEND="${COMMON_DEPEND}" > >-PATCHES=( >- "${FILESDIR}/libbpf-9999-paths.patch" >-) >- >-src_compile() { >+src_configure() { > append-cflags -fPIC >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- CC="$(tc-getCC)" >-} >- >-src_install() { >- emake \ >- BUILD_SHARED=y \ >- LIBSUBDIR="$(get_libdir)" \ >- DESTDIR="${D}" \ >- $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ >- install install_uapi_headers >- >- insinto /usr/$(get_libdir)/pkgconfig >- doins ${PN}.pc >+ tc-export CC >+ export PREFIX="${EPREFIX}/usr" >+ export LIBSUBDIR="$(get_libdir)" > } >-- >2.26.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=659254">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 741400
: 659254
