Description
mehw
2020-11-16 14:22:07 UTC
Created attachment 671635 [details]
sys-fs/reiser4progs-1.2.1.ebuild (link libreiser4 against static libmisc)
Amended to apply patches and to call eautoreconf.
Created attachment 671638 [details, diff]
sys-fs/reiser4progs/files v1.2.1-v2.0.4 patch to link libreiser4 against libmisc
Patch to link libreiser4 against libmisc.
Suitable for sys-fs/reiser4progs versions from v1.2.1 to v2.0.4.
Created attachment 671641 [details]
sys-fs/reiser4progs-2.0.2.ebuild (link libreiser4 against static libmisc)
Amended to apply patches and to call eautoreconf.
Created attachment 671644 [details, diff]
sys-fs/reiser4progs/files v2.0.2-v2.0.4 progs/volume links against static libmisc
Keeps reiser4progs progs/volume linked against a static libmisc.
Suitable for sys-fs/reiser4progs versions from v2.0.2 to v2.0.4.
Created attachment 671647 [details]
sys-fs/reiser4progs-2.0.3.ebuild (link libreiser4 against static libmisc)
Amended to apply patches and to call eautoreconf.
Created attachment 671650 [details] bump sys-fs/reiser4progs-2.0.4.ebuild (link libreiser4 against static libmisc) Version bump. Uses https://github.com/edward6/reiser4progs/tree/567e5f09f2cc9719686c1d33f8db8b8ad22b83f5 (v2.0.4 isn't yet in https://sourceforge.net/projects/reiser4/). Created attachment 671653 [details, diff]
sys-fs/reiser4progs/files v2.0.4 progs/{cpfs,resizefs} link against static libmisc
This patch isn't really needed. Useful just to keep an eye of what is happening in progs/*.
Commit c9e2f5cc3be55434ea0d508d42112ff951fcce91 removed cpfs and resizefs as SUBDIRS from progs/Makefile.am. Hence they will not be compiled/installed.
Created attachment 671656 [details]
sys-fs/reiser4progs updated Manifest file
Add v2.0.4 to Manifest file.
Created attachment 674569 [details] sys-fs/reiser4progs-1.2.1-r1.ebuild (link libreiser4 against static libmisc and fix libtinfo) Hi. The developer acknowledged the issue about libreiser4 not linkging against the static libmisc. Also, bugs about reiser4progs code should go to the http://vger.kernel.org/vger-lists.html#reiserfs-devel mailing list. reiser4progs-1.2.1 is fixed upstream with the following commit: https://github.com/edward6/reiser4progs/commit/4ae24d18328802c63bf0d4cec7bbfa417031fdae reiser4progs-2.0.4 is fixed upstream with the following commit: https://github.com/edward6/reiser4progs/commit/eefb72de39d13cdc575371c0657b84b93b6df2a9 On sourceforge, reiser4progs-2.0.4 release already integrates the patch: https://sourceforge.net/projects/reiser4/ The amended ebuilds attached also fix an error about not finding ncurses during configure, due to sys-libs/ncurses[tinfo], when the use flag readline is enabled: configure: WARNING: ncurses could not be found which is required for the --with-readline option (which is enabled by default). What you should expect, instead, are links against libreadline and libncurses(w), or against libreadline and libtinfo(w) for sys-libs/ncurses[tinfo] (the 'w' is for sys-libs/readline[unicode]). # USE="readline unicode" emerge =reiser4progs-1.2.1-r1 $ gcc test-libreiser4.c -o test-libreiser4 -lreiser4 -laal $ ldd test-libreiser4 linux-vdso.so.1 (0x00007ffdbe4a3000) libreiser4-1.2.so.1 => /lib64/libreiser4-1.2.so.1 (0x00007fca47ef8000) libaal-1.0.so.7 => /lib64/libaal-1.0.so.7 (0x00007fca47eee000) libc.so.6 => /lib64/libc.so.6 (0x00007fca47d32000) libuuid.so.1 => /lib64/libuuid.so.1 (0x00007fca47d29000) libreadline.so.8 => /lib64/libreadline.so.8 (0x00007fca47cd6000) /lib64/ld-linux-x86-64.so.2 (0x00007fca47f8f000) libtinfow.so.6 => /lib64/libtinfow.so.6 (0x00007fca47c98000) diff reiser4progs-1.2.1.ebuild reiser4progs-1.2.1-r1.ebuild 4c4 < EAPI="6" --- > EAPI=7 6c6 < inherit multilib eutils toolchain-funcs usr-ldscript --- > inherit multilib toolchain-funcs usr-ldscript autotools 9c9 < HOMEPAGE="https://sourceforge.net/projects/reiser4/" --- > HOMEPAGE="https://sourceforge.net/projects/reiser4/ https://github.com/edward6/reiser4progs" 14,15c14,15 < KEYWORDS="amd64 arm ppc ppc64 -sparc x86" < IUSE="debug readline static static-libs" --- > KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86" > IUSE="debug readline static static-libs unicode" 20c20,21 < static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] )" --- > static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] ) > readline? ( sys-libs/readline:0=[unicode=] )" 24c25,32 < PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch ) --- > REQUIRED_USE="unicode? ( readline )" > > PATCHES=( > "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch > "${FILESDIR}"/${P}-libmisc-static.patch > ) > > S="${WORKDIR}/${P}" 26a35,58 > default > > # Set unicode when readline is compiled with USE=unicode, and > # fix missing libtinfo if ncurses is compiled with USE=tinfo. > if use readline; then > # Check if readline is compiled with USE=unicode. > local unicode=$(usex unicode w '') > > # Use pkg-config to get the right ncurses libs for readline. > local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses${unicode} --libs) > > # Use pkg-config to get the right ncurses lib names to search for. > local search_libs > for lib in $($(tc-getPKG_CONFIG) ncurses${unicode} --libs-only-l); do > search_libs="${search_libs} ${lib#-l}" > done > sed -ri \ > -e "s:-lncurses:${ncurses_libs}:g" \ > -e "s:(AC_SEARCH_LIBS\(tgetent,) ncurses,:\1${search_libs},:g" \ > configure.ac || die > fi > > eautoreconf > 33,34d64 < < default 52a83 > find "${ED}" -type f -name "*.la" -delete || die Created attachment 674572 [details]
sys-fs/reiser4progs-1.2.1.ebuild configure log: ncurses could not be found
# USE=readline emerge =reiser4progs-1.2.1
configure: WARNING: ncurses could not be found which is required for the --with-readline option (which is enabled by default).
Created attachment 674575 [details] sys-fs/reiser4progs-2.0.2-r1 (link libreiser4 against static libmisc and fix libtinfo) diff reiser4progs-1.2.1-r1.ebuild reiser4progs-2.0.2-r1.ebuild 3a4,5 > # Note that reiser4progs-2.0.2 doesn't provide the volume.reiser4.8 man page. > 17c19 < LIB_DEPEND=">=sys-libs/libaal-1.0.6:=[static-libs(+)] --- > LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] 20c22 < static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] ) --- > static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] ) 28a31 > "${FILESDIR}"/${PN}-1.2.1-libmisc-static.patch Created attachment 674578 [details] sys-fs/reiser4progs-2.0.3-r1 (link libreiser4 against static libmisc and fix libtinfo) diff reiser4progs-2.0.2-r1.ebuild reiser4progs-2.0.3-r1.ebuild 4,5d3 < # Note that reiser4progs-2.0.2 doesn't provide the volume.reiser4.8 man page. < 32c30 < "${FILESDIR}"/${P}-libmisc-static.patch --- > "${FILESDIR}"/${PN}-2.0.2-libmisc-static.patch Created attachment 674581 [details]
sys-fs/reiser4progs-2.0.4 (fix libtinfo)
diff reiser4progs-2.0.3-r1.ebuild reiser4progs-2.0.4.ebuild
29,30d28
< "${FILESDIR}"/${PN}-1.2.1-libmisc-static.patch
< "${FILESDIR}"/${PN}-2.0.2-libmisc-static.patch
Created attachment 674584 [details]
sys-fs/reiser4progs Manifest file
Updated Manifest file.
|