aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-07-28 16:39:16 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-07-28 18:16:12 +0100
commit5c6206dba5629933408567723916c56d5127e525 (patch)
tree72cf29b90b21384367560ad4730c9d94ce5a0850
parentfa37c7c5b9a7b784feb39b291480aac42d7a4589 (diff)
downloadpaludis-5c6206dba5629933408567723916c56d5127e525.tar.gz
paludis-5c6206dba5629933408567723916c56d5127e525.tar.xz
Remove GNU awk/make/patch/sed wrappers.
These cause more trouble than they're worth, including libtool configuring in a reference to /usr/libexec/paludis/util, and automake tests invoking them with PATH=., causing them to fail. Users will have to manually arrange for the GNU versions to be visible, on systems where they are not the default.
-rw-r--r--NEWS7
-rw-r--r--paludis/repositories/e/ebuild/utils/Makefile.am12
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/awk19
-rw-r--r--paludis/repositories/e/ebuild/utils/awk_TEST.bash47
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/make19
-rw-r--r--paludis/repositories/e/ebuild/utils/make_TEST.bash41
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/patch19
-rw-r--r--paludis/repositories/e/ebuild/utils/patch_TEST.bash75
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/sed19
-rw-r--r--paludis/repositories/e/ebuild/utils/sed_TEST.bash46
10 files changed, 9 insertions, 295 deletions
diff --git a/NEWS b/NEWS
index c36eca4..7d9e804 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,13 @@ News for Paludis
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
+master:
+ * Paludis no longer includes wrappers for GNU awk, make, patch, and sed.
+ Users of systems where the default versions are not the GNU versions
+ must use PATH manipulation or aliases in /etc/paludis/bashrc to ensure
+ that the GNU versions are used. (This is not necessary on typical Linux
+ systems; check <command> --version if in doubt.)
+
0.28.0:
* Compilers without tr1 memory, type traits and functional support are no
longer supported. This means you, gcc-3.
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index 01fc29e..67c7bc5 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -53,11 +53,7 @@ libexecprog_SCRIPTS = \
unpack \
wrapped_ldconfig \
wrapped_getfsize \
- wrapped_getmtime \
- make \
- sed \
- awk \
- patch
+ wrapped_getmtime
libexecbindir = $(libexecdir)/paludis/utils
libexecbin_PROGRAMS = \
@@ -81,11 +77,7 @@ TESTS_ENVIRONMENT = env \
bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
TESTS = \
- wrapped_getfsize_TEST.bash \
- sed_TEST.bash \
- awk_TEST.bash \
- patch_TEST.bash \
- make_TEST.bash
+ wrapped_getfsize_TEST.bash
prep_scripts = prepall prepallstrip prepallman prepallinfo prepstrip prepman prepinfo prepdocs prepalldocs
diff --git a/paludis/repositories/e/ebuild/utils/awk b/paludis/repositories/e/ebuild/utils/awk
deleted file mode 100755
index 54f1daa..0000000
--- a/paludis/repositories/e/ebuild/utils/awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if /bin/awk --version &>/dev/null ; then
- /bin/awk "$@"
- exit $?
-elif /usr/bin/awk --version &>/dev/null ; then
- /usr/bin/awk "$@"
- exit $?
-elif /usr/local/bin/awk --version &>/dev/null ; then
- /usr/local/bin/awk "$@"
- exit $?
-elif gawk --version &>/dev/null ; then
- gawk "$@"
- exit $?
-else
- echo "!!! Don't know how to use GNU awk on this system" 1>&2
- exit 1
-fi
-
diff --git a/paludis/repositories/e/ebuild/utils/awk_TEST.bash b/paludis/repositories/e/ebuild/utils/awk_TEST.bash
deleted file mode 100644
index 223710d..0000000
--- a/paludis/repositories/e/ebuild/utils/awk_TEST.bash
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2007 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-awk_TEST()
-{
- mkdir -p awk_TEST_dir ; test_return_code
-
- cat <<"END" > awk_TEST_dir/before ; test_return_code
-one
-two
-three
-END
-
- ${PALUDIS_EBUILD_DIR}/utils/awk --version >/dev/null ; test_return_code
- ${PALUDIS_EBUILD_DIR}/utils/awk -- '/t\wo/ { gsub(/two/, "five"); } { print }' \
- awk_TEST_dir/before > awk_TEST_dir/after ; test_return_code
-
- cat <<"END" > awk_TEST_dir/expected ; test_return_code
-one
-five
-three
-END
-
- ! cmp awk_TEST_dir/before awk_TEST_dir/after >/dev/null ; test_return_code
- cmp awk_TEST_dir/after awk_TEST_dir/expected >/dev/null ; test_return_code
-
- ! ${PALUDIS_EBUILD_DIR}/utils/awk -- '/t\wo/ { gsub(/two/, "five"); } { print }' \
- awk_TEST_dir/doesnotexist 2>/dev/null ; test_return_code
-
- rm -fr awk_TEST_dir
-}
-
diff --git a/paludis/repositories/e/ebuild/utils/make b/paludis/repositories/e/ebuild/utils/make
deleted file mode 100755
index e121e6a..0000000
--- a/paludis/repositories/e/ebuild/utils/make
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if /bin/make --version &>/dev/null ; then
- /bin/make "$@"
- exit $?
-elif /usr/bin/make --version &>/dev/null ; then
- /usr/bin/make "$@"
- exit $?
-elif /usr/local/bin/make --version &>/dev/null ; then
- /usr/local/bin/make "$@"
- exit $?
-elif gmake --version &>/dev/null ; then
- gmake "$@"
- exit $?
-else
- echo "!!! Don't know how to use GNU make on this system" 1>&2
- exit 1
-fi
-
diff --git a/paludis/repositories/e/ebuild/utils/make_TEST.bash b/paludis/repositories/e/ebuild/utils/make_TEST.bash
deleted file mode 100644
index 259db38..0000000
--- a/paludis/repositories/e/ebuild/utils/make_TEST.bash
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2007 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-make_TEST()
-{
- mkdir -p make_TEST_dir ; test_return_code
-
- ${PALUDIS_EBUILD_DIR}/utils/sed -e 's, ,\t,g' <<"END" > make_TEST_dir/GNUmakefile
-A=x
-B=$(A:C/$/.1/)
-
-x.1 :
- exit 1
-
-yes : $(B)
-
-no : x.1
-END
-
- ${PALUDIS_EBUILD_DIR}/utils/make --version >/dev/null ; test_return_code
- ${PALUDIS_EBUILD_DIR}/utils/make -C make_TEST_dir yes &>/dev/null ; test_return_code
- ! ${PALUDIS_EBUILD_DIR}/utils/make -C make_TEST_dir no &>/dev/null ; test_return_code
-
- rm -fr make_TEST_dir
-}
-
diff --git a/paludis/repositories/e/ebuild/utils/patch b/paludis/repositories/e/ebuild/utils/patch
deleted file mode 100755
index 38d9729..0000000
--- a/paludis/repositories/e/ebuild/utils/patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if /bin/patch -g0 </dev/null &>/dev/null ; then
- /bin/patch "$@"
- exit $?
-elif /usr/bin/patch -g0 </dev/null &>/dev/null ; then
- /usr/bin/patch "$@"
- exit $?
-elif /usr/local/bin/patch -g0 </dev/null &>/dev/null ; then
- /usr/local/bin/patch "$@"
- exit $?
-elif gpatch -g0 </dev/null &>/dev/null ; then
- gpatch "$@"
- exit $?
-else
- echo "!!! Don't know how to use GNU patch on this system" 1>&2
- exit 1
-fi
-
diff --git a/paludis/repositories/e/ebuild/utils/patch_TEST.bash b/paludis/repositories/e/ebuild/utils/patch_TEST.bash
deleted file mode 100644
index ae95a99..0000000
--- a/paludis/repositories/e/ebuild/utils/patch_TEST.bash
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2007 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-patch_TEST()
-{
- mkdir -p patch_TEST_dir ; test_return_code
-
- cat <<"END" > patch_TEST_dir/a ; test_return_code
-one
-two
-three
-four
- five
-six
-END
-
- ${PALUDIS_EBUILD_DIR}/utils/patch --version >/dev/null ; test_return_code
- cat <<"END" | ${PALUDIS_EBUILD_DIR}/utils/patch -l -p1 ; test_return_code
-What's the deal with the giant space monkeys?
---- old/patch_TEST_dir/a
-+++ new/patch_TEST_dir/a
-@@ -1,6 +1,6 @@
- one
- two
--three
-+ten
- four
-- five
-+five
- six
-END
-
- cat <<"END" > patch_TEST_dir/expected ; test_return_code
-one
-two
-ten
-four
-five
-six
-END
-
- cmp patch_TEST_dir/expected patch_TEST_dir/a >/dev/null ; test_return_code
-
- cat <<"END" | { ! ${PALUDIS_EBUILD_DIR}/utils/patch -l -p1 &>/dev/null ; } ; test_return_code
---- old/patch_TEST_dir/b
-+++ new/patch_TEST_dir/b
-@@ -1,6 +1,6 @@
- one
- two
--three
-+ten
- four
-- five
-+five
- six
-END
-
- rm -fr patch_TEST_dir
-}
-
diff --git a/paludis/repositories/e/ebuild/utils/sed b/paludis/repositories/e/ebuild/utils/sed
deleted file mode 100755
index eb04b14..0000000
--- a/paludis/repositories/e/ebuild/utils/sed
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if /bin/sed --version &>/dev/null ; then
- /bin/sed "$@"
- exit $?
-elif /usr/bin/sed --version &>/dev/null ; then
- /usr/bin/sed "$@"
- exit $?
-elif /usr/local/bin/sed --version &>/dev/null ; then
- /usr/local/bin/sed "$@"
- exit $?
-elif gsed --version &>/dev/null ; then
- gsed "$@"
- exit $?
-else
- echo "!!! Don't know how to use GNU sed on this system" 1>&2
- exit 1
-fi
-
diff --git a/paludis/repositories/e/ebuild/utils/sed_TEST.bash b/paludis/repositories/e/ebuild/utils/sed_TEST.bash
deleted file mode 100644
index 2ff6b66..0000000
--- a/paludis/repositories/e/ebuild/utils/sed_TEST.bash
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2007 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-sed_TEST()
-{
- mkdir -p sed_TEST_dir ; test_return_code
-
- cat <<"END" > sed_TEST_dir/before ; test_return_code
-one
-two
-three
-END
-
- ${PALUDIS_EBUILD_DIR}/utils/sed --version >/dev/null ; test_return_code
- ${PALUDIS_EBUILD_DIR}/utils/sed --in-place -e '/\(two\|four\)/s/two/five/' \
- sed_TEST_dir/before ; test_return_code
-
- cat <<"END" > sed_TEST_dir/after ; test_return_code
-one
-five
-three
-END
-
- cmp sed_TEST_dir/before sed_TEST_dir/after >/dev/null ; test_return_code
-
- ! ${PALUDIS_EBUILD_DIR}/utils/sed -i -e '/\(two\|four\)/s/two/five/' \
- sed_TEST_dir/doesnotexist 2>/dev/null ; test_return_code
-
- rm -fr sed_TEST_dir
-}
-