bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove sed command lookup and hardcoding in edit-script.sh

Browse source 
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 3a814ee6bc 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>
This commit is contained in:
Eli Schwartz 2021-03-13 22:06:00 -05:00 • committed by Allan McRae
parent ede73f4d89
commit 9bf3d6a760
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-aux/edit-script.sh.in
View file

@ -4,7 +4,7 @@ input=$1
output=$2 output=$2
mode=$3 mode=$3
"@SED@" \ sed \
-e "s|@rootdir[@]|@ROOTDIR@|g" \ -e "s|@rootdir[@]|@ROOTDIR@|g" \
-e "s|@localedir[@]|@LOCALEDIR@|g" \ -e "s|@localedir[@]|@LOCALEDIR@|g" \
-e "s|@sysconfdir[@]|@sysconfdir@|g" \ -e "s|@sysconfdir[@]|@sysconfdir@|g" \

2
meson.build
View file

@ -28,7 +28,6 @@ LIBMAKEPKGDIR = join_paths(PREFIX, DATAROOTDIR, 'makepkg')
PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name())
PYTHON = import('python').find_installation('python3') PYTHON = import('python').find_installation('python3')
SED = find_program('sed')
DU = find_program('du') DU = find_program('du')
LDCONFIG = get_option('ldconfig') LDCONFIG = get_option('ldconfig')
MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') 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 # annoyingly, we have to maintain two sets of configuration_data which is
# largely identical, but which distinguishes between quoting needs. # largely identical, but which distinguishes between quoting needs.
substs = configuration_data() substs = configuration_data()
substs.set('SED', SED.path())
substs.set('CARCH', carch) substs.set('CARCH', carch)
substs.set('CHOST', chost) substs.set('CHOST', chost)
substs.set('PKGEXT', get_option('pkg-ext')) substs.set('PKGEXT', get_option('pkg-ext'))