commit: 7a1b86643307d7b6c89c7785d9cb99130e2f1c6b Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Dec 22 20:55:25 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Dec 22 20:55:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7a1b8664
sys-apps/coreutils: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/coreutils/Manifest | 3 - sys-apps/coreutils/coreutils-8.29.ebuild | 232 -------------------- sys-apps/coreutils/coreutils-8.30.ebuild | 238 --------------------- sys-apps/coreutils/coreutils-8.32.ebuild | 2 +- sys-apps/coreutils/files/coreutils-8.22-mint.patch | 154 ------------- 5 files changed, 1 insertion(+), 628 deletions(-) diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 44d2e827af..0f0d568b69 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,5 +1,2 @@ -DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2 -DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 -DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 diff --git a/sys-apps/coreutils/coreutils-8.29.ebuild b/sys-apps/coreutils/coreutils-8.29.ebuild deleted file mode 100644 index e430e60c93..0000000000 --- a/sys-apps/coreutils/coreutils-8.29.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit eutils flag-o-matic python-any-r1 toolchain-funcs - -PATCH_VER="1.0" -DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" -HOMEPAGE="https://www.gnu.org/software/coreutils/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz - https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr" - -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) - caps? ( sys-libs/libcap ) - gmp? ( dev-libs/gmp:=[static-libs] ) - xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) - selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - app-arch/xz-utils - test? ( - dev-lang/perl - dev-perl/Expect - !userland_BSD? ( - dev-util/strace - ) - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') - )" -RDEPEND+=" - hostname? ( !sys-apps/net-tools[hostname] ) - kill? ( - !sys-apps/util-linux[kill] - !sys-process/procps[kill] - ) - !app-misc/realpath - !<sys-apps/util-linux-2.13 - !<sys-apps/sandbox-2.10-r4 - !sys-apps/stat - !net-mail/base64 - !sys-apps/mktemp - !<app-forensics/tct-1.18-r1 - !<net-fs/netatalk-2.0.3-r4" - -pkg_setup() { - if use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - if ! use vanilla ; then - eapply "${WORKDIR}"/patch/*.patch - fi - - eapply_user - - epatch "${FILESDIR}"/${PN}-8.22-mint.patch - # fixup libstdbuf non-libtool stuff - if [[ ${CHOST} == *-darwin* ]] ; then - if [[ ${CHOST} == *-darwin9* ]] ; then - # we need replacement libs from libcoreutils.a here in order - # to finish the linking - sed -i \ - -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \ - Makefile.in \ - || die - fi - sed -i \ - -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \ - Makefile.in \ - || die - elif use elibc_Cygwin ; then - epatch "${FILESDIR}"/${PN}-8.28-cygwin-8.26-3.patch - sed -i -e 's|\(libstdbuf\.so\)$(EXEEXT)|\1|g' Makefile.in || die - fi - sed -i \ - -e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \ - src/stdbuf.c \ - Makefile.in \ - configure \ - || die - - # Since we've patched many .c files, the make process will try to - # re-build the manpages by running `./bin --help`. When doing a - # cross-compile, we can't do that since 'bin' isn't a native bin. - # Also, it's not like we changed the usage on any of these things, - # so let's just update the timestamps and skip the help2man step. - set -- man/*.x - touch ${@/%x/1} - - # Avoid perl dep for compiled in dircolors default #348642 - if ! has_version dev-lang/perl ; then - touch src/{dircolors.h,fs.h,fs-is-local.h} - touch ${@/%x/1} - fi -} - -src_configure() { - local myconf=( - --with-packager="Gentoo" - --with-packager-version="${PVR} (p${PATCH_VER:-0})" - --with-packager-bug-reports="https://bugs.gentoo.org/"; - --enable-install-program="arch,$(usev hostname),$(usev kill)" - --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" - --enable-largefile - $(use caps || echo --disable-libcap) - $(use_enable nls) - $(use_enable acl) - $(use_enable multicall single-binary) - $(use_enable xattr) - $(use_with gmp) - ) - if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then - export fu_cv_sys_stat_statfs2_bsize=yes #311569 - export gl_cv_func_realpath_works=yes #416629 - fi - - export gl_cv_func_mknod_works=yes #409919 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 - use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) - # kill/uptime - procps - # groups/su - shadow - # hostname - net-tools - econf "${myconf[@]}" -} - -src_test() { - # Known to fail with FEATURES=usersandbox (bug #439574): - # - tests/du/long-from-unreadable.sh} (bug #413621) - # - tests/rm/deep-2.sh (bug #413621) - # - tests/dd/no-allocate.sh (bug #629660) - if has usersandbox $FEATURES ; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi - - # Non-root tests will fail if the full path isn't - # accessible to non-root users - chmod -R go-w "${WORKDIR}" - chmod a+rx "${WORKDIR}" - - # coreutils tests like to do `mount` and such with temp dirs - # so make sure /etc/mtab is writable #265725 - # make sure /dev/loop* can be mounted #269758 - mkdir -p "${T}"/mount-wrappers - mkwrap() { - local w ww - for w in "$@" ; do - ww="${T}/mount-wrappers/${w}" - cat <<-EOF > "${ww}" - #!${EPREFIX}/bin/sh - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@" - EOF - chmod a+rx "${ww}" - done - } - mkwrap mount umount - - addwrite /dev/full - #export RUN_EXPENSIVE_TESTS="yes" - #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" \ - emake -j1 -k check -} - -src_install() { - default - - insinto /etc - newins src/dircolors.hin DIR_COLORS - - if [[ ${USERLAND} == "GNU" ]] ; then - cd "${ED%/}"/usr/bin || die - dodir /bin - # move critical binaries into /bin (required by FHS) - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls - mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use kill; then - mv kill ../../bin/ || die - fi - # move critical binaries into /bin (common scripts) - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - # as long as /bin resolves to a different directory than /usr/bin - local x - [[ ${EROOT}bin/. -ef ${EROOT}usr/bin/. ]] || - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done - else - # For now, drop the man pages, collides with the ones of the system. - rm -rf "${ED%/}"/usr/share/man - fi - - if use elibc_Cygwin ; then - ! use kill || mv "${ED}"/bin/{,g}kill || die - mv "${ED}"/usr/libexec/${PN}/libstdbuf$(get_libname){.exe,} || die - fi -} - -pkg_postinst() { - ewarn "Make sure you run 'hash -r' in your active shells." - ewarn "You should also re-source your shell settings for LS_COLORS" - ewarn " changes, such as: source /etc/profile" - - # Help out users using experimental filesystems - if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then - case $(uname -r) in - 2.6.[12][0-9]|2.6.3[0-7]*) - ewarn "You are running a system with a buggy btrfs driver." - ewarn "Please upgrade your kernel to avoid silent corruption." - ewarn "See: https://bugs.gentoo.org/353907"; - ;; - esac - fi -} diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild deleted file mode 100644 index b8303c115b..0000000000 --- a/sys-apps/coreutils/coreutils-8.30.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit eutils flag-o-matic python-any-r1 toolchain-funcs - -PATCH_VER="01" -DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" -HOMEPAGE="https://www.gnu.org/software/coreutils/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz - https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" - -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) - caps? ( sys-libs/libcap ) - gmp? ( dev-libs/gmp:=[static-libs] ) - xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) - selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - app-arch/xz-utils - test? ( - dev-lang/perl - dev-perl/Expect - !userland_BSD? ( - dev-util/strace - ) - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') - )" -RDEPEND+=" - hostname? ( !sys-apps/net-tools[hostname] ) - kill? ( - !sys-apps/util-linux[kill] - !sys-process/procps[kill] - ) - !app-misc/realpath - !<sys-apps/util-linux-2.13 - !<sys-apps/sandbox-2.10-r4 - !sys-apps/stat - !net-mail/base64 - !sys-apps/mktemp - !<app-forensics/tct-1.18-r1 - !<net-fs/netatalk-2.0.3-r4" - -pkg_setup() { - if use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - if ! use vanilla ; then - eapply "${WORKDIR}"/patch/*.patch - fi - - eapply_user - - epatch "${FILESDIR}"/${PN}-8.22-mint.patch - - # fixup libstdbuf non-libtool stuff - if [[ ${CHOST} == *-darwin* ]] ; then - if [[ ${CHOST} == *-darwin9* ]] ; then - # we need replacement libs from libcoreutils.a here in order - # to finish the linking - sed -i \ - -e "/src_libstdbuf_so_LDADD/s:$: lib/libcoreutils.a:" \ - Makefile.in \ - || die - # and we need serial building :( - export MAKEOPTS+=" -j1" - fi - sed -i \ - -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \ - Makefile.in \ - || die - elif use elibc_Cygwin ; then - epatch "${FILESDIR}"/${PN}-8.28-cygwin-8.26-3.patch - sed -i -e 's|\(libstdbuf\.so\)$(EXEEXT)|\1|g' Makefile.in || die - fi - sed -i \ - -e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \ - src/stdbuf.c \ - Makefile.in \ - configure \ - || die - - # Since we've patched many .c files, the make process will try to - # re-build the manpages by running `./bin --help`. When doing a - # cross-compile, we can't do that since 'bin' isn't a native bin. - # Also, it's not like we changed the usage on any of these things, - # so let's just update the timestamps and skip the help2man step. - set -- man/*.x - touch ${@/%x/1} - - # Avoid perl dep for compiled in dircolors default #348642 - if ! has_version dev-lang/perl ; then - touch src/dircolors.h - touch ${@/%x/1} - fi -} - -src_configure() { - local myconf=( - --with-packager="Gentoo" - --with-packager-version="${PVR} (p${PATCH_VER:-0})" - --with-packager-bug-reports="https://bugs.gentoo.org/"; - --enable-install-program="arch,$(usev hostname),$(usev kill)" - --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" - --enable-largefile - $(usex caps '' --disable-libcap) - $(use_enable nls) - $(use_enable acl) - $(use_enable multicall single-binary) - $(use_enable xattr) - $(use_with gmp) - ) - if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then - export fu_cv_sys_stat_statfs2_bsize=yes #311569 - export gl_cv_func_realpath_works=yes #416629 - fi - - export gl_cv_func_mknod_works=yes #409919 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 - use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) - # kill/uptime - procps - # groups/su - shadow - # hostname - net-tools - econf "${myconf[@]}" -} - -src_test() { - # Known to fail with FEATURES=usersandbox (bug #439574): - # - tests/du/long-from-unreadable.sh} (bug #413621) - # - tests/rm/deep-2.sh (bug #413621) - # - tests/dd/no-allocate.sh (bug #629660) - if has usersandbox $FEATURES ; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi - - # Non-root tests will fail if the full path isn't - # accessible to non-root users - chmod -R go-w "${WORKDIR}" - chmod a+rx "${WORKDIR}" - - # coreutils tests like to do `mount` and such with temp dirs - # so make sure /etc/mtab is writable #265725 - # make sure /dev/loop* can be mounted #269758 - mkdir -p "${T}"/mount-wrappers - mkwrap() { - local w ww - for w in "$@" ; do - ww="${T}/mount-wrappers/${w}" - cat <<-EOF > "${ww}" - #!${EPREFIX}/bin/sh - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@" - EOF - chmod a+rx "${ww}" - done - } - mkwrap mount umount - - addwrite /dev/full - #export RUN_EXPENSIVE_TESTS="yes" - #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" \ - emake -j1 -k check -} - -src_install() { - default - - insinto /etc - newins src/dircolors.hin DIR_COLORS - - if [[ ${USERLAND} == "GNU" ]] ; then - cd "${ED%/}"/usr/bin || die - dodir /bin - # move critical binaries into /bin (required by FHS) - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls - mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use hostname; then - mv hostname ../../bin/ || die - fi - if use kill; then - mv kill ../../bin/ || die - fi - if use split-usr ; then - # move critical binaries into /bin (common scripts) - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - local x - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done - fi - else - # For now, drop the man pages, collides with the ones of the system. - rm -rf "${ED%/}"/usr/share/man - fi - - if use elibc_Cygwin ; then - ! use kill || mv "${ED}"/bin/{,g}kill || die - mv "${ED}"/usr/libexec/${PN}/libstdbuf$(get_libname){.exe,} || die - fi -} - -pkg_postinst() { - ewarn "Make sure you run 'hash -r' in your active shells." - ewarn "You should also re-source your shell settings for LS_COLORS" - ewarn " changes, such as: source /etc/profile" - - # Help out users using experimental filesystems - if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then - case $(uname -r) in - 2.6.[12][0-9]|2.6.3[0-7]*) - ewarn "You are running a system with a buggy btrfs driver." - ewarn "Please upgrade your kernel to avoid silent corruption." - ewarn "See: https://bugs.gentoo.org/353907"; - ;; - esac - fi -} diff --git a/sys-apps/coreutils/coreutils-8.32.ebuild b/sys-apps/coreutils/coreutils-8.32.ebuild index 52bb58d0bc..6e23e61ae1 100644 --- a/sys-apps/coreutils/coreutils-8.32.ebuild +++ b/sys-apps/coreutils/coreutils-8.32.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" RESTRICT="!test? ( test )" diff --git a/sys-apps/coreutils/files/coreutils-8.22-mint.patch b/sys-apps/coreutils/files/coreutils-8.22-mint.patch deleted file mode 100644 index ec0457415c..0000000000 --- a/sys-apps/coreutils/files/coreutils-8.22-mint.patch +++ /dev/null @@ -1,154 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=260551 -http://bugs.gentoo.org/show_bug.cgi?id=264763 -http://bugs.gentoo.org/show_bug.cgi?id=497772 -https://savannah.gnu.org/patch/index.php?6758 - -diff -u lib/mountlist.c lib/mountlist.c ---- lib/mountlist.c 2009-02-07 09:58:37.000000000 +0000 -+++ lib/mountlist.c 2009-04-08 04:04:19.000000000 +0000 -@@ -387,6 +387,7 @@ - If NEED_FS_TYPE is true, ensure that the file system type fields in - the returned list are valid. Otherwise, they might not be. */ - -+#ifndef __MINT__ - struct mount_entry * - read_file_system_list (bool need_fs_type) - { -@@ -970,6 +971,84 @@ - return NULL; - } - } -+#else /* __MINT__ */ -+ -+#include <mintbind.h> -+#include <osbind.h> -+#include <sys/statfs.h> -+#include <mint/dcntl.h> -+ -+/* get the list of available drives */ -+static long -+get_drives(void) -+{ -+ long drive_bits; -+ -+ drive_bits = Dsetdrv(Dgetdrv()); -+ drive_bits &= ~(1|2); /* exclude all floppies */ -+ -+ return drive_bits; -+} -+ -+struct mount_entry * -+read_file_system_list (bool need_fs_type) -+{ -+ struct mount_entry *mount_list; -+ struct mount_entry *me; -+ struct mount_entry *mtail; -+ struct statfs fsp; -+ struct fs_info info; -+ long drive_bits; -+ int i, j; -+ char lw[] = "a:/", str[25]; -+ -+ /* Start the list off with a dummy entry. */ -+ me = xmalloc (sizeof (*me)); -+ me->me_next = NULL; -+ mount_list = mtail = me; -+ -+ drive_bits = get_drives(); -+ for (i = 0; i < 32; i++) -+ { -+ if (drive_bits & (1L << i)) -+ { -+ if (i < 26) -+ lw[0] = 'a' + i; -+ else -+ lw[0] = '1' + i - 26; -+ -+ if(statfs(lw, &fsp) == 0) -+ { -+ char name[32]; -+ -+ me = xmalloc (sizeof (*me)); -+ -+ me->me_devname = xstrdup(lw); -+ me->me_mountdir = xstrdup("u:/"); -+ -+ if (lw[0] < 'a') /* 1: .. 6: */ -+ me->me_dev = lw[0] - '1' + 27; -+ else -+ me->me_dev = lw[0] - 'a'; -+ -+ get_fsname(lw, NULL, name); -+ me->me_type = xstrdup(name); -+ /* Add to the linked list. */ -+ me->me_next = NULL; -+ mtail->me_next = me; -+ mtail = me; -+ } -+ } -+ } -+ -+ /* Free the dummy head. */ -+ me = mount_list; -+ mount_list = mount_list->me_next; -+ free(me); -+ return mount_list; -+} -+ -+#endif /* __MINT__ */ - - /* Free a mount entry as returned from read_file_system_list (). */ - -diff -u src/df.c src/df.c ---- src/df.c 2009-02-14 10:18:27.000000000 +0000 -+++ src/df.c 2009-04-08 04:04:19.000000000 +0000 -@@ -337,7 +337,12 @@ - It would be better to report on the unmounted file system, - but statfs doesn't do that on most systems. */ - if (!stat_file) -+#ifndef __MINT__ - stat_file = mount_point ? mount_point : disk; -+#else -+ /* MiNT: mount_point is always u:/, so use disk */ -+ stat_file = disk; -+#endif - - if (force_fsu) - fsu = *force_fsu; -diff -u src/uptime.c src/uptime.c ---- src/uptime.c 2009-01-21 13:33:41.000000000 +0000 -+++ src/uptime.c 2009-04-08 04:04:19.000000000 +0000 -@@ -17,6 +17,9 @@ - /* Created by hacking who.c by Kaveh Ghazi gh...@caip.rutgers.edu. */ - - #include <config.h> -+#ifdef __MINT__ -+#define HAVE_PROC_UPTIME 1 -+#endif - #include <getopt.h> - #include <stdio.h> - -@@ -62,7 +65,11 @@ - #ifdef HAVE_PROC_UPTIME - FILE *fp; - -+#ifdef __MINT__ -+ fp = fopen ("/kern/uptime", "r"); -+#else - fp = fopen ("/proc/uptime", "r"); -+#endif - if (fp != NULL) - { - char buf[BUFSIZ]; -diff -u Makefile.in Makefile.in ---- Makefile.in 2014-01-07 10:01:01.000000000 +0000 -+++ Makefile.in 2014-01-07 10:36:50.000000000 +0000 -@@ -3310,7 +3310,7 @@ - # must precede $(LIBINTL) in order to ensure we use GNU getopt. - # But libcoreutils.a must also follow $(LIBINTL), since libintl uses - # replacement functions defined in libcoreutils.a. --LDADD = src/libver.a lib/libcoreutils.a $(LIBINTL) lib/libcoreutils.a -+LDADD = src/libver.a lib/libcoreutils.a $(LIBINTL) lib/libcoreutils.a $(LIB_PTHREAD) - - # First, list all programs, to make listing per-program libraries easier. - # See [ below.
