diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-16 00:01:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-16 00:01:30 +0100 |
| commit | 66113e7871aede225d661473925cea4cce9e6d23 (patch) | |
| tree | 5bca10c8eeb5527fc3625567fc296a60dd9695cd /sys-apps/keyutils | |
| parent | 514c44bb9cc421df9c323acbad430cbb6ee5b89a (diff) | |
gentoo auto-resync : 16:05:2024 - 00:01:30
Diffstat (limited to 'sys-apps/keyutils')
| -rw-r--r-- | sys-apps/keyutils/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 57 |
2 files changed, 33 insertions, 26 deletions
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest index 4fa5ebecfead..5eb45770debe 100644 --- a/sys-apps/keyutils/Manifest +++ b/sys-apps/keyutils/Manifest @@ -4,5 +4,5 @@ AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7 AUX keyutils-1.6.3-tests.patch 2335 BLAKE2B cedda01c2cc02dd6ae20c4300fce71ecc505a4db2543ddfafd1e525651998b13a3d8d781eea54c89a68b16478de875249f77c71c1fedf090f4226c94838f6a86 SHA512 cf0ce9f56e45a9d9aa72b2d0d28b93f59dacae7f69eaf24d9c40121ff44dacceaec9a5d0bf01fcc836c58aa954dfd2cabc8d1402e7393a8139f77869880379b0 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 -EBUILD keyutils-1.6.3-r1.ebuild 3580 BLAKE2B 3167910b21fb3dbefc7707bffb512feeb6d823c5c3c330318f04f59be0b56dc5a007b07b0758feee17f991920216b03d34812d3da4a3c73dcf616277463217b2 SHA512 3140119c875adb25d766f975b78b1ef87d3ab3fac8dbaeb95ad00e40f92ce7c9ebd8d37db6f55710320859b13256fac5762dc20b4048daec017c0c432cfeba92 +EBUILD keyutils-1.6.3-r1.ebuild 3640 BLAKE2B dd6379a479bd9ded9a30e781bb28e52744e4af2188e1b71bb3bef7040b63cb7611f50007a9dc0a747791eec58f12ebcb18386832266a664f1f9d7949bd2bc507 SHA512 3d355f4ad22cae381ea234c1f3ea6689e7ccb1a82e094f02d426be7d04ede4ae55c6ad9186a66081727b6e8de1a3d328b86882ff9ac3518d9699d8d34e61ad0d MISC metadata.xml 519 BLAKE2B c0bf6f0d10e2ba0230b8789bb20cd186ac7e01b44038eb01b3461e6bc663ddbb74af569d84477aa058e34e72a65aa12da59f922e83fa019f41ef54ca0137ff88 SHA512 e8b988a0a7b200d5d07822ca136d2532a4dd13c12f019aae27ae1958d93b75fa8f2bf5f05a2f492bb39274eea992e219a1bf0a1c821637859d4da19a50f632fc diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild index c8d82212103a..6d09620c632a 100644 --- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild +++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild @@ -70,30 +70,38 @@ src_prepare() { multilib_copy_sources } +mymake() { + local args=( + PREFIX="${EPREFIX}/usr" + ETCDIR="${EPREFIX}/etc" + BINDIR="${EPREFIX}/bin" + SBINDIR="${EPREFIX}/sbin" + SHAREDIR="${EPREFIX}/usr/share/keyutils" + MANDIR="${EPREFIX}/usr/share/man" + INCLUDEDIR="${EPREFIX}/usr/include" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" + CFLAGS="${CFLAGS}" + CXXFLAGS="${CXXFLAGS}" + RPATH=$(usex static -static '') + BUILDFOR= + NO_ARLIB="${NO_ARLIB}" + ) + if use static; then + args+=( LIB_DEPENDENCY='$(ARLIB)' ) + fi + emake "${args[@]}" "$@" +} + multilib_src_compile() { - tc-export AR CC CXX - sed -i \ - -e "1iRPATH = $(usex static -static '')" \ - -e '/^C.*FLAGS/s|:=|+=|' \ - -e 's:-Werror::' \ - -e '/^BUILDFOR/s:=.*:=:' \ - -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \ - -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \ - -e "s: /: ${EPREFIX}/:g" \ - -e '/^NO_ARLIB/d' \ - Makefile || die - - # We need the static lib in order to statically link programs. - if use static ; then - export NO_ARLIB=0 - # Hack the progs to depend on the static lib instead. - sed -i \ - -e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \ - Makefile || die + local NO_ARLIB + if use static; then + NO_ARLIB=0 else - export NO_ARLIB=$(usex static-libs 0 1) + NO_ARLIB=$(usex static-libs 0 1) fi - emake + tc-export AR CC CXX + mymake } multilib_src_test() { @@ -101,14 +109,13 @@ multilib_src_test() { # older versions already installed in the system. LD_LIBRARY_PATH=${BUILD_DIR} \ PATH="${BUILD_DIR}:${PATH}" \ - emake test + mymake test } multilib_src_install() { # Possibly undo the setting for USE=static (see src_compile). - export NO_ARLIB=$(usex static-libs 0 1) - - default + local NO_ARLIB=$(usex static-libs 0 1) + mymake DESTDIR="${D}" install } multilib_src_install_all() { |