aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timothy Redaelli <drizzt@gentoo.org> 2006-12-29 17:57:53 +0000
committerAvatar Timothy Redaelli <drizzt@gentoo.org> 2006-12-29 17:57:53 +0000
commitf56d126aa339a2b1ce88a996fa4d50d5bfc98f12 (patch)
tree1bd8145643fcada29806c02b662df4efaf44f0c5
parent8195877cfb234e543dca9bd985a212690d84bfa1 (diff)
downloadpaludis-f56d126aa339a2b1ce88a996fa4d50d5bfc98f12.tar.gz
paludis-f56d126aa339a2b1ce88a996fa4d50d5bfc98f12.tar.xz
Removed wrappers and replaced with some aliases.
Fixed ebuild/utils/Makefile.am to work with FreeBSD make.
-rw-r--r--configure.ac1
-rw-r--r--ebuild/Makefile.am1
-rwxr-xr-xebuild/ebuild.bash1
-rw-r--r--ebuild/portability.bash.in27
-rw-r--r--ebuild/utils/Makefile.am45
-rw-r--r--ebuild/utils/awk.in2
-rw-r--r--ebuild/utils/make.in2
-rw-r--r--ebuild/utils/patch.in2
-rw-r--r--ebuild/utils/sed.in2
9 files changed, 37 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac
index 3d72ee4..0a1047c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -831,6 +831,7 @@ AC_OUTPUT(
ebuild/fetchers/Makefile
ebuild/utils/Makefile
ebuild/echo_functions.bash
+ ebuild/portability.bash
eselect/Makefile
hooks/Makefile
hooks/demos/Makefile
diff --git a/ebuild/Makefile.am b/ebuild/Makefile.am
index 4ee3806..674a561 100644
--- a/ebuild/Makefile.am
+++ b/ebuild/Makefile.am
@@ -32,6 +32,7 @@ libexecprog_SCRIPTS = \
pkg_prerm.bash \
pkg_setup.bash \
portage_stubs.bash \
+ portability.bash \
sandbox.bash \
src_compile.bash \
src_install.bash \
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 3a5f315..4d4f372 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -96,6 +96,7 @@ ebuild_load_module multilib_functions
ebuild_load_module install_functions
ebuild_load_module build_functions
ebuild_load_module eclass_functions
+ebuild_load_module portability
export PALUDIS_HOME="$(canonicalise ${PALUDIS_HOME:-${HOME}} )"
diff --git a/ebuild/portability.bash.in b/ebuild/portability.bash.in
new file mode 100644
index 0000000..246f387
--- /dev/null
+++ b/ebuild/portability.bash.in
@@ -0,0 +1,27 @@
+#!/bin/bash
+# vim: set sw=4 sts=4 et :
+
+# Copyright (c) 2006 Timothy Redaelli <drizzt@gentoo.org>
+#
+# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
+# Gentoo Foundation and distributed under the terms of the GNU General
+# Public License v2.
+#
+# 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 as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
+#
+# 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
+
+@NEED_SED_WRAPPER_TRUE@alias sed=gsed
+@NEED_AWK_WRAPPER_TRUE@alias awk=gawk
+@NEED_MAKE_WRAPPER_TRUE@alias make=gmake
+@NEED_PATCH_WRAPPER_TRUE@alias patch=gpatch
diff --git a/ebuild/utils/Makefile.am b/ebuild/utils/Makefile.am
index 8c5a58e..f96f2ab 100644
--- a/ebuild/utils/Makefile.am
+++ b/ebuild/utils/Makefile.am
@@ -2,24 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
libexecprogdir = $(libexecdir)/paludis/utils
-libexecprog_SCRIPTS_extra =
-
-if NEED_SED_WRAPPER
-libexecprog_SCRIPTS_extra += sed
-endif
-
-if NEED_AWK_WRAPPER
-libexecprog_SCRIPTS_extra += awk
-endif
-
-if NEED_MAKE_WRAPPER
-libexecprog_SCRIPTS_extra += make
-endif
-
-if NEED_PATCH_WRAPPER
-libexecprog_SCRIPTS_extra += patch
-endif
-
libexecprog_SCRIPTS = \
canonicalise \
dobin \
@@ -67,8 +49,7 @@ libexecprog_SCRIPTS = \
prepallinfo \
prepinfo \
prepdocs \
- prepalldocs \
- $(libexecprog_SCRIPTS_extra)
+ prepalldocs
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
@@ -86,34 +67,22 @@ prep_scripts = prepall prepallstrip prepallman prepallinfo prepstrip prepman pre
EXTRA_DIST = $(libexecprog_SCRIPTS) $(check_SCRIPTS) run_test.bash \
newlib.so.in newlib.a.in dolib.so.in dolib.a.in prep.in $(TESTS)
-CLEANFILES = *~ newlib.so newlib.a dolib.so dolib.a sed awk make patch $(prep_scripts)
+CLEANFILES = *~ newlib.so newlib.a dolib.so dolib.a $(prep_scripts)
newlib.a : newlib.a.in
- cat $< > $@
+ cat $? > $@
newlib.so : newlib.so.in
- cat $< > $@
+ cat $? > $@
dolib.so : dolib.so.in
- cat $< > $@
+ cat $? > $@
dolib.a : dolib.a.in
- cat $< > $@
-
-sed : sed.in
- cat $< > $@
-
-awk: awk.in
- cat $< > $@
-
-make: make.in
- cat $< > $@
-
-patch: patch.in
- cat $< > $@
+ cat $? > $@
$(prep_scripts) : prep.in
- cat $< > $@
+ cat $? > $@
check_PROGRAMS =
diff --git a/ebuild/utils/awk.in b/ebuild/utils/awk.in
deleted file mode 100644
index da814c3..0000000
--- a/ebuild/utils/awk.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gawk "$@"
diff --git a/ebuild/utils/make.in b/ebuild/utils/make.in
deleted file mode 100644
index 0b03c26..0000000
--- a/ebuild/utils/make.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gmake "$@"
diff --git a/ebuild/utils/patch.in b/ebuild/utils/patch.in
deleted file mode 100644
index f6b1394..0000000
--- a/ebuild/utils/patch.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gpatch "$@"
diff --git a/ebuild/utils/sed.in b/ebuild/utils/sed.in
deleted file mode 100644
index 1077e99..0000000
--- a/ebuild/utils/sed.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gsed "$@"