diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-14 04:06:00 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2021-03-25 02:38:58 +0100 |
| commit | 9bf3d6a7603bf48771a20d1f4bd789670e7446f7 (patch) | |
| tree | fe3011dee8d8f8f5d3c0d647eed647fd6535fd95 | |
| parent | ede73f4d898946a7e54634169b3605a024553315 (diff) | |
| download | pacman-9bf3d6a7603bf48771a20d1f4bd789670e7446f7.tar.gz pacman-9bf3d6a7603bf48771a20d1f4bd789670e7446f7.tar.xz | |
remove sed command lookup and hardcoding in edit-script.sh
We should not need to hardcode the path to sed as we simply don't care.
We don't check what kind of sed we found, and we're using the same one
we initially found on the PATH, which is surely still on the PATH.
At one point we did care to find the system copy of sed and hardcode it
in makepkg, because we also passed non-portable -i options to it and
makepkg needed to continue working on macOS even if some incompatible
GNU sed got installed afterward, elsewhere on the PATH. But this was
never relevant to the in-tree buildsystem script running sed.
In commit 3a814ee6bca9ee24a868c0dc032b321048a53e08 we removed even that,
so we don't need to look it up at all.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | build-aux/edit-script.sh.in | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 661c22d5..85c56cfe 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -4,7 +4,7 @@ input=$1 output=$2 mode=$3 -"@SED@" \ +sed \ -e "s|@rootdir[@]|@ROOTDIR@|g" \ -e "s|@localedir[@]|@LOCALEDIR@|g" \ -e "s|@sysconfdir[@]|@sysconfdir@|g" \ diff --git a/meson.build b/meson.build index ea9bd2f7..8ccd5c78 100644 --- a/meson.build +++ b/meson.build @@ -28,7 +28,6 @@ LIBMAKEPKGDIR = join_paths(PREFIX, DATAROOTDIR, 'makepkg') PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) PYTHON = import('python').find_installation('python3') -SED = find_program('sed') DU = find_program('du') LDCONFIG = get_option('ldconfig') MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') @@ -251,7 +250,6 @@ carch = chost.split('-')[0] # annoyingly, we have to maintain two sets of configuration_data which is # largely identical, but which distinguishes between quoting needs. substs = configuration_data() -substs.set('SED', SED.path()) substs.set('CARCH', carch) substs.set('CHOST', chost) substs.set('PKGEXT', get_option('pkg-ext')) |