aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-02-17 18:04:49 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-02-17 18:04:49 +0000
commit9949acef55fb94eb580d42155079d6de7f32e639 (patch)
tree255a07640dffe0ca0c0eaeeba53d49a55e36ad5d
parent663ac9c885dd469399cb7cf88fe481b4ca684cec (diff)
downloadpaludis-9949acef55fb94eb580d42155079d6de7f32e639.tar.gz
paludis-9949acef55fb94eb580d42155079d6de7f32e639.tar.xz
Add leading "--" to configure --help grep
http://mid.gmane.org/21730.17032.896228.663965@a1i15.kph.uni-mainz.de
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_0_setup.sh2
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_4_setup.sh2
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_5_setup.sh2
-rw-r--r--paludis/repositories/e/eapis/4.conf2
-rw-r--r--paludis/repositories/e/eapis/5.conf2
-rw-r--r--paludis/repositories/e/ebuild/0/build_functions.bash2
6 files changed, 6 insertions, 6 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_0_setup.sh b/paludis/repositories/e/e_repository_TEST_0_setup.sh
index 968d494..4ffef00 100755
--- a/paludis/repositories/e/e_repository_TEST_0_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_0_setup.sh
@@ -912,7 +912,7 @@ src_unpack() {
#!/bin/sh
if echo "$@" | grep -q 'help' ; then
- echo disable-dependency-tracking
+ echo --disable-dependency-tracking
exit 0
fi
diff --git a/paludis/repositories/e/e_repository_TEST_4_setup.sh b/paludis/repositories/e/e_repository_TEST_4_setup.sh
index 27b13de..81b6593 100755
--- a/paludis/repositories/e/e_repository_TEST_4_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_4_setup.sh
@@ -913,7 +913,7 @@ src_unpack() {
#!/bin/sh
if echo "$@" | grep -q 'help' ; then
- echo disable-dependency-tracking
+ echo --disable-dependency-tracking
exit 0
fi
diff --git a/paludis/repositories/e/e_repository_TEST_5_setup.sh b/paludis/repositories/e/e_repository_TEST_5_setup.sh
index 7c4bba0..880c7d7 100755
--- a/paludis/repositories/e/e_repository_TEST_5_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_5_setup.sh
@@ -96,7 +96,7 @@ src_unpack() {
#!/bin/sh
if echo "$@" | grep -q 'help' ; then
- echo disable-silent-rules
+ echo --disable-silent-rules
exit 0
fi
diff --git a/paludis/repositories/e/eapis/4.conf b/paludis/repositories/e/eapis/4.conf
index 6b0de62..2a21485 100644
--- a/paludis/repositories/e/eapis/4.conf
+++ b/paludis/repositories/e/eapis/4.conf
@@ -64,7 +64,7 @@ use_with_enable_empty_third_argument = true
rdepend_defaults_to_depend = false
-econf_extra_options_help_dependent = disable-dependency-tracking::--disable-dependency-tracking
+econf_extra_options_help_dependent = --disable-dependency-tracking::--disable-dependency-tracking
doman_lang_filenames_overrides = true
diff --git a/paludis/repositories/e/eapis/5.conf b/paludis/repositories/e/eapis/5.conf
index 91d51ac..698697b 100644
--- a/paludis/repositories/e/eapis/5.conf
+++ b/paludis/repositories/e/eapis/5.conf
@@ -28,7 +28,7 @@ use_stable_mask_force = true
env_ebuild_phase_func = EBUILD_PHASE_FUNC
best_has_version_host_root = true
-econf_extra_options_help_dependent = ${econf_extra_options_help_dependent} disable-silent-rules::--disable-silent-rules
+econf_extra_options_help_dependent = ${econf_extra_options_help_dependent} --disable-silent-rules::--disable-silent-rules
new_stdin = true
require_use_expand_in_iuse = true
diff --git a/paludis/repositories/e/ebuild/0/build_functions.bash b/paludis/repositories/e/ebuild/0/build_functions.bash
index 7304557..2218809 100644
--- a/paludis/repositories/e/ebuild/0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/0/build_functions.bash
@@ -47,7 +47,7 @@ econf()
local extra_options_help=""
for i in ${PALUDIS_ECONF_EXTRA_OPTIONS_HELP_DEPENDENT}; do
- "${ECONF_SOURCE}/configure" --help 2>/dev/null | grep -q "${i%%::*}" \
+ "${ECONF_SOURCE}/configure" --help 2>/dev/null | grep -q -e "${i%%::*}" \
&& extra_options_help+=" ${i#*::}"
done