diff options
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 5 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch | 28 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild (renamed from sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild) | 24 |
3 files changed, 44 insertions, 13 deletions
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index fef4de7c9be3..09efac2e6485 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,8 +1,9 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 +AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58 -DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0 SHA512 a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43 +DIST xfsprogs-5.3.0.tar.xz 1247636 BLAKE2B 0f8b2eafa1b1c91ff8bbcf8f79f61a8bea47123b859ec7a181dea37891ca0345a79a0cc714f003fbe560b00c0c2fc76e6bf6a3a1465f51c44b2df3a3dcbe6415 SHA512 308202eba3765e416c43877ad68d528f6c7d03ca024b89709aa3ca818f6c6692e3b90a809cbb81ff886624300c0e548925e70b34c30c47bac8dcfe4bb9c18857 EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198 -EBUILD xfsprogs-5.2.1.ebuild 2781 BLAKE2B 5de2467f44d58ccdbf060143464002ba7bbd3b26da7bf47879dd56f2f161357e3e732283d7ec64e64ad11b98018ccb0b6ecc6f1e53b3d74935572689aff935b4 SHA512 a99e84cf41b7d1ab16a85e3a77bbb9c4cc2cd4f43725ed62fe62042f55e2c30dba63dafc4ed977b03082492dc267351687d0687c5a5fe375f9e34f08c9b2dd8c +EBUILD xfsprogs-5.3.0.ebuild 2776 BLAKE2B 4833f2c95cde504f429095702217d63be549413933dc97dbf13e9206db943ab95e7f7c579eb522578a1092f508b30f5dd76d780fee62e609611549ea36d3b1fd SHA512 a3b116e1420b4e21aa3eb051f6c6ed9e7d8278db24ae43b3d61be79ed53fec14ad678b1148f55f55e3c162be8b08c85996028e64b01923a75c2105b52cba4af5 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch new file mode 100644 index 000000000000..f943817df487 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch @@ -0,0 +1,28 @@ +In Gentoo we install libs to /usr/lib* and let gen_usr_ldscript +handle /lib*. + +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -57,9 +57,10 @@ endif + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR) ++ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -68,7 +69,7 @@ endif + # Other things want the shared libs to appear in /usr/lib, else they'll + # link with the static libs there. So, another symlink to get the .so into + # /usr/lib. +-ifeq ($(ENABLE_SHARED),yes) ++ifeq ($(ENABLE_SHARED_HANDLED_BY_gen_usr_ldscript),yes) + INSTALL_LTLIB_DEV = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ + ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild index 9aea191d9021..6058992139d6 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs systemd +inherit flag-o-matic toolchain-funcs systemd usr-ldscript DESCRIPTION="xfs filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/" @@ -26,9 +26,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-4.9.0-underlinking.patch - "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch "${FILESDIR}"/${PN}-4.15.0-docdir.patch + "${FILESDIR}"/${PN}-5.3.0-libdir.patch ) pkg_setup() { @@ -51,8 +50,17 @@ src_prepare() { } src_configure() { + # include/builddefs.in will add FCFLAGS to CFLAGS which will + # unnecessarily clutter CFLAGS (and fortran isn't used) + unset FCFLAGS + export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} + + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + unset PLATFORM # if set in user env, this breaks configure # Upstream does NOT support --disable-static anymore, @@ -88,11 +96,6 @@ src_configure() { } src_compile() { - # Unset {CF,LD}FLAGS which are already set via configure - # but will cause problems when available during make. - # Fixed in >=xfsprogs-5.3.0. - unset CFLAGS LDFLAGS - emake V=1 } @@ -100,6 +103,5 @@ src_install() { emake DIST_ROOT="${ED}" install emake DIST_ROOT="${ED}" install-dev - # removing unnecessary .la files if not needed - find "${ED}" -type f -name '*.la' -delete || die + gen_usr_ldscript -a handle } |