From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- dev-libs/libbpf/Manifest | 26 ++--------- dev-libs/libbpf/files/libbpf-0.0.5-paths.patch | 38 ---------------- dev-libs/libbpf/files/libbpf-0.0.7-paths.patch | 38 ---------------- .../files/libbpf-0.0.9-fix-hashmap-on-lp32.patch | 49 -------------------- dev-libs/libbpf/files/libbpf-0.3.0-paths.patch | 34 -------------- dev-libs/libbpf/libbpf-0.0.6.ebuild | 47 ------------------- dev-libs/libbpf/libbpf-0.0.7.ebuild | 47 ------------------- dev-libs/libbpf/libbpf-0.0.8.ebuild | 47 ------------------- dev-libs/libbpf/libbpf-0.0.9-r1.ebuild | 48 -------------------- dev-libs/libbpf/libbpf-0.1.0-r1.ebuild | 53 ---------------------- dev-libs/libbpf/libbpf-0.1.1.ebuild | 53 ---------------------- dev-libs/libbpf/libbpf-0.2.ebuild | 53 ---------------------- dev-libs/libbpf/libbpf-0.3.ebuild | 2 +- dev-libs/libbpf/libbpf-0.4.0.ebuild | 2 +- dev-libs/libbpf/libbpf-0.5.0.ebuild | 51 +++++++++++++++++++++ dev-libs/libbpf/libbpf-9999.ebuild | 38 +++++++--------- 16 files changed, 75 insertions(+), 551 deletions(-) delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.5-paths.patch delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.7-paths.patch delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch delete mode 100644 dev-libs/libbpf/files/libbpf-0.3.0-paths.patch delete mode 100644 dev-libs/libbpf/libbpf-0.0.6.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.0.7.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.0.8.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.0.9-r1.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.1.0-r1.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.1.1.ebuild delete mode 100644 dev-libs/libbpf/libbpf-0.2.ebuild create mode 100644 dev-libs/libbpf/libbpf-0.5.0.ebuild (limited to 'dev-libs/libbpf') diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest index d0575f6af693..8d83982102cd 100644 --- a/dev-libs/libbpf/Manifest +++ b/dev-libs/libbpf/Manifest @@ -1,25 +1,9 @@ -AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214daca198db2a6d6b436bdf536aa89e58f39ab10a2cf9dbbf192a159cd1231b68dc3292396e1164950b1514de3d SHA512 47ccd456abf37cdf7e986633eb5a90c16963e5d99608f0c3dd6b035466a0ffe6769001d2bf448c2da88f6427fdac658f364b960a072949523a964ae01836add0 -AUX libbpf-0.0.7-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d -AUX libbpf-0.0.9-fix-hashmap-on-lp32.patch 1681 BLAKE2B 9728e6508da6703576d1bdf78dc17a6a2d8952c99a5b1c1bd2aef8a9712a8e29a127b1d2681837effe4a5f1653e68228b44819596dc49ca4970770208e5bf56b SHA512 6c0226e75612bf48297f2a363b8788931b283390c0a7e155b00fc6383ec943b06e28da29b6a43a1e3a76f4599000150a1b3eb352e44a892d07cf830afc32efab -AUX libbpf-0.3.0-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039 -DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71 -DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d -DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c -DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a -DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe -DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f -DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3 DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1 -EBUILD libbpf-0.0.6.ebuild 1000 BLAKE2B 160f3b9d575fd2553735b2f26ec0ab8b681a002964ae31eba4e9599f541c867f350d55fe4c6e1dfbe6077790bcf3fe9089166538b02973040b51c7bb37d7ce04 SHA512 95785c36fb8ad5130ba55c1c8b996d5e5c1bafd5eb80879494902f7f1fd3c3760c7604d51f36423e121898955b4879b88bb68bdaade76d0c90a2e0f51d27a269 -EBUILD libbpf-0.0.7.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf -EBUILD libbpf-0.0.8.ebuild 1005 BLAKE2B b74c9b8a780943160237a87ae3833c996ec5a51685afa4c416ad5ba45f7a932785fd602b51758d2abb9df30e6d5e0b8b44f2ff44c647f473883e696c3eeaadef SHA512 6bf1a72e9bd4e531e35d8914ebac32ce6bac68462dfb5d181b51933108874c65ec50e1de8b31579b5db31d6eb3527159a087bfa730bb2c534dc8bbaed62b9daf -EBUILD libbpf-0.0.9-r1.ebuild 1059 BLAKE2B 0605fbeaa1da1de10e51ee0bcaa0b355bcff883734ee0a80ab44bea1960d6ea04960d6207e2a27278bba1716333df10684adebf9ea833f471dc07b981a9ecb37 SHA512 420a4b0daf9178266793113ef97aa90c5cf44a233256b65b8e60829873c90343af8606d17a138589aa5ff728cd42b85afe70f4bf9b3851112edb9a7a0c69c672 -EBUILD libbpf-0.1.0-r1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd -EBUILD libbpf-0.1.1.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd -EBUILD libbpf-0.2.ebuild 1157 BLAKE2B 876830f71d9f39683088881e1d3f37fe314a2b3057c3cfce1677a82e6f4bfddc2244499ed50c247c1e7221536242ccd06de1aa343406a47479c94935bf03a871 SHA512 bd206fb3c86cd3dca235afc909224219bad0bbcf636b6f690d90460443162710577ad4736ccca2e77376b1668271bdb12c7ad98d5e7e73fa30cae48caf79acdd -EBUILD libbpf-0.3.ebuild 1241 BLAKE2B db815a22ebf51f56beeb8a3925f9a36cec7f0d412c110f4011e7efa40c7004ee49d4c80831628ca6db8cd97566ce16c0fa10cf20b2fde92e69aa5a769e0da85e SHA512 257b06cb0de2834d4cd09490607a2184416685ea5f4a4df57c5dc406af49cbf1d0841dff6d764aacf64e1c64c4069179ff4d6870a4145f6136086fe32c0975cc -EBUILD libbpf-0.4.0.ebuild 1219 BLAKE2B 5eefc16a773bfe7b524475b7ec39083fc8c8be20d8819cf6643165ace61f5575a8607638a01b0e75ce669e67472149389ee413fb79729f88b43ee16deb005f5e SHA512 9f5c19d60b98616655777c73fecdfbcb20c04c37934d00b91d91c86597ec6ef1da9e2651df7325f51640e7101152ac04c7376c6b348dc965549e35bbb9dfd036 -EBUILD libbpf-9999.ebuild 1185 BLAKE2B aa1fc95895f35b93f6786514095c05bdf49504aa13ebef41f2fdcd4c929826ccbb87ec2aaeff1ee0ca2c7022fa8c43bc50a396bddf7dd32e6b61275c4649a8e8 SHA512 ebbef537d0dbe3a66172bc10e6c9c7fea2c6b4e295feddbde3570b88a2e43af33258f747d6556f3f77a259a15711990bc2024900665e36f275556cf5712186d8 +DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85 +EBUILD libbpf-0.3.ebuild 1240 BLAKE2B 3f287692b5209625c4178e0e418be4c460dc25e8d62db303cb86214c5253e7f2b65f7d0be405eee169ed541ad05a351b78db8e1f71481b33e816208dd198d569 SHA512 4de801d74e973942ac2d8a00143a6460739caf09cac1e5a0ffce0a2ec8e18211d9a991f560bf53daec305c5aa0c948fc2239e988640065b9499a843e56dad587 +EBUILD libbpf-0.4.0.ebuild 1218 BLAKE2B 744c309ebd4de13663bd1cd6b8eb61a521e4eb27075e7a1811bb152408c1eff00a3b561b811b3d9fc98520712e5c08dcd115741bd9180264ca88f1776ca242c8 SHA512 6d0ca0f36f5cd2c311924dc56e3c2d16cca05e289080244ab301cd62f0e3165238914c00b60af9063e7d46d801668006cb91dc334c296207790d2197d0f7ea75 +EBUILD libbpf-0.5.0.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb +EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb MISC metadata.xml 306 BLAKE2B 6af2288a09cffb8801efe6841d11dae5e8f3659dd75be45f746bab3f48686458916dab796fd9d535e1a6fa0ca78567e8227e29ef06cc22c4a9d0b1cbebd30ab0 SHA512 c027c14965069ece90130984bab710dc19f199a184e834666449f4bc0874de3b5f5d878f3a1fe6f817a85eef2bc45914e640f0140878b7454a32738a7f500032 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 e9eda9c2dced..000000000000 --- 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-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch deleted file mode 100644 index cbc267b64a38..000000000000 --- a/dev-libs/libbpf/files/libbpf-0.0.7-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/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch b/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch deleted file mode 100644 index 98baf1cd6051..000000000000 --- a/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cd016d93f7bf280fe6f2dfc723257786dd3ffd00 Mon Sep 17 00:00:00 2001 -From: Jakub Bogusz -Date: Thu, 9 Jul 2020 15:57:23 -0700 -Subject: [PATCH] libbpf: Fix libbpf hashmap on (I)LP32 architectures - -On ILP32, 64-bit result was shifted by value calculated for 32-bit long type -and returned value was much outside hashmap capacity. -As advised by Andrii Nakryiko, this patch uses different hashing variant for -architectures with size_t shorter than long long. - -Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap") -Signed-off-by: Jakub Bogusz -Signed-off-by: Andrii Nakryiko -Signed-off-by: Alexei Starovoitov -Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com ---- - hashmap.h | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/hashmap.h b/hashmap.h -index df59fd4..e0af36b 100644 ---- a/hashmap.h -+++ b/hashmap.h -@@ -11,14 +11,18 @@ - #include - #include - #include --#ifndef __WORDSIZE --#define __WORDSIZE (__SIZEOF_LONG__ * 8) --#endif - - static inline size_t hash_bits(size_t h, int bits) - { - /* shuffle bits and return requested number of upper bits */ -- return (h * 11400714819323198485llu) >> (__WORDSIZE - bits); -+#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__) -+ /* LP64 case */ -+ return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits); -+#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__) -+ return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits); -+#else -+# error "Unsupported size_t size" -+#endif - } - - typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx); --- -2.26.2 - diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch deleted file mode 100644 index ff087bb38712..000000000000 --- a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -76,7 +76,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) - -@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) - $(OBJDIR)/libbpf.pc: - $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \ - -e "s|@LIBDIR@|$(LIBDIR_PC)|" \ -+ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ - -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ - < libbpf.pc.template > $@ - ---- 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.6.ebuild b/dev-libs/libbpf/libbpf-0.0.6.ebuild deleted file mode 100644 index 0853d4751e03..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.5-paths.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 -} diff --git a/dev-libs/libbpf/libbpf-0.0.7.ebuild b/dev-libs/libbpf/libbpf-0.0.7.ebuild deleted file mode 100644 index 43363c91efae..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.7.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.7-paths.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 -} diff --git a/dev-libs/libbpf/libbpf-0.0.8.ebuild b/dev-libs/libbpf/libbpf-0.0.8.ebuild deleted file mode 100644 index 43363c91efae..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.8.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.7-paths.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 -} diff --git a/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild b/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild deleted file mode 100644 index b01f2de058d8..000000000000 --- a/dev-libs/libbpf/libbpf-0.0.9-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -HOMEPAGE="https://github.com/libbpf/libbpf" -DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 BSD-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+static-libs" - -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -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 -} diff --git a/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild b/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild deleted file mode 100644 index 1c2508425132..000000000000 --- a/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} =~ [9]{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi -S="${WORKDIR}/${P}/src" - -HOMEPAGE="https://github.com/libbpf/libbpf" -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" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.7-paths.patch" -) - -src_compile() { - 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 -} diff --git a/dev-libs/libbpf/libbpf-0.1.1.ebuild b/dev-libs/libbpf/libbpf-0.1.1.ebuild deleted file mode 100644 index 1c2508425132..000000000000 --- a/dev-libs/libbpf/libbpf-0.1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} =~ [9]{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi -S="${WORKDIR}/${P}/src" - -HOMEPAGE="https://github.com/libbpf/libbpf" -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" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.7-paths.patch" -) - -src_compile() { - 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 -} diff --git a/dev-libs/libbpf/libbpf-0.2.ebuild b/dev-libs/libbpf/libbpf-0.2.ebuild deleted file mode 100644 index 1c2508425132..000000000000 --- a/dev-libs/libbpf/libbpf-0.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} =~ [9]{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi -S="${WORKDIR}/${P}/src" - -HOMEPAGE="https://github.com/libbpf/libbpf" -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" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}/libbpf-0.0.7-paths.patch" -) - -src_compile() { - 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 -} diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild index f80ac671a49d..754ab6101584 100644 --- a/dev-libs/libbpf/libbpf-0.3.ebuild +++ b/dev-libs/libbpf/libbpf-0.3.ebuild @@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}" PATCHES=( - "${FILESDIR}/libbpf-0.3.0-paths.patch" + "${FILESDIR}/libbpf-9999-paths.patch" ) src_compile() { diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild index 0ef44fea2683..438a4a1415ec 100644 --- a/dev-libs/libbpf/libbpf-0.4.0.ebuild +++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild @@ -33,7 +33,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/libbpf-0.3.0-paths.patch" + "${FILESDIR}/libbpf-9999-paths.patch" ) src_compile() { diff --git a/dev-libs/libbpf/libbpf-0.5.0.ebuild b/dev-libs/libbpf/libbpf-0.5.0.ebuild new file mode 100644 index 000000000000..2b8fd07a6a92 --- /dev/null +++ b/dev-libs/libbpf/libbpf-0.5.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +S="${WORKDIR}/${P}/src" + +DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0/${PV}" +IUSE="static-libs" + +DEPEND=" + sys-kernel/linux-headers + virtual/libelf" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/libbpf-9999-paths.patch +) + +src_configure() { + append-cflags -fPIC + tc-export CC AR + export LIBSUBDIR="$(get_libdir)" + export V=1 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + install install_uapi_headers + + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc +} diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index a122d56cb683..2b8fd07a6a92 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -10,46 +10,42 @@ if [[ ${PV} =~ [9]{4,} ]]; then EGIT_REPO_URI="https://github.com/libbpf/libbpf.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi S="${WORKDIR}/${P}/src" -HOMEPAGE="https://github.com/libbpf/libbpf" DESCRIPTION="Stand-alone build of libbpf from the Linux kernel" +HOMEPAGE="https://github.com/libbpf/libbpf" LICENSE="GPL-2 LGPL-2.1 BSD-2" SLOT="0/${PV}" -IUSE="+static-libs" +IUSE="static-libs" -COMMON_DEPEND="virtual/libelf - !<=dev-util/bcc-0.7.0" -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers" -RDEPEND="${COMMON_DEPEND}" +DEPEND=" + sys-kernel/linux-headers + virtual/libelf" +RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/libbpf-9999-paths.patch" + "${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)" \ - AR="$(tc-getAR)" \ - V=1 + tc-export CC AR + export LIBSUBDIR="$(get_libdir)" + export V=1 } src_install() { emake \ - BUILD_SHARED=y \ - LIBSUBDIR="$(get_libdir)" \ DESTDIR="${D}" \ - $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ install install_uapi_headers + if ! use static-libs; then + find "${ED}" -name '*.a' -delete || die + fi + insinto /usr/$(get_libdir)/pkgconfig doins ${PN}.pc } -- cgit v1.2.3