[pacman-dev] [PATCH] build: remove references to variable replacements from pacman-optimize

[Allan McRae]

On 8/3/19 1:07 pm, Eli Schwartz wrote:
> MODECMD and OWNERCMD are not used by pacman itself, so we don't need to
> check for and replace them now that pacman-optimize is removed.
> 
> Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
> ---
>  build-aux/edit-script.sh.in |  2 --
>  configure.ac                | 10 ----------
>  meson.build                 |  2 --
>  scripts/Makefile.am         |  2 --
>  4 files changed, 16 deletions(-)
> 

There were heaps of references in meson.build that you missed.  I
removed them too.

A

> diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in
> index 3b0058ce..a25218cb 100644
> --- a/build-aux/edit-script.sh.in
> +++ b/build-aux/edit-script.sh.in
> @@ -19,8 +19,6 @@ mode=$3
>    -e "s|@TEMPLATE_DIR[@]|@TEMPLATE_DIR@|g" \
>    -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \
>    -e "s|@INODECMD[@]|@INODECMD@|g" \
> -  -e "s|@OWNERCMD[@]|@OWNERCMD@|g" \
> -  -e "s|@MODECMD[@]|@MODECMD@|g" \
>    -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \
>    -e "s|@SEDPATH[@]|@SEDPATH@|g" \
>    -e "s|@DUFLAGS[@]|@DUFLAGS@|g" \
> diff --git a/configure.ac b/configure.ac
> index 74bf8c1f..6d2b2410 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -354,24 +354,18 @@ GCC_VISIBILITY_CC
>  DEFAULT_DUFLAGS=" -sk --apparent-size"
>  DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i"
>  INODECMD="stat -c '%i %n'"
> -OWNERCMD="stat -c '%u:%g'"
> -MODECMD="stat -c '%a'"
>  STRIP_BINARIES="--strip-all"
>  STRIP_SHARED="--strip-unneeded"
>  STRIP_STATIC="--strip-debug"
>  case "${host_os}" in
>  	*bsd*)
>  		INODECMD="stat -f '%i %N'"
> -		OWNERCMD="stat -f '%u:%g'"
> -		MODECMD="stat -f '%Lp'"
>  		DEFAULT_SEDINPLACEFLAGS=" -i \"\""
>  		DEFAULT_DUFLAGS=" -sk"
>  		;;
>  	darwin*)
>  		host_os_darwin=yes
>  		INODECMD="/usr/bin/stat -f '%i %N'"
> -		OWNERCMD="/usr/bin/stat -f '%u:%g'"
> -		MODECMD="/usr/bin/stat -f '%Lp'"
>  		DEFAULT_SEDINPLACEFLAGS=" -i ''"
>  		DEFAULT_DUFLAGS=" -sk"
>  		STRIP_BINARIES=""
> @@ -383,8 +377,6 @@ AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
>  AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
>  AC_PATH_PROGS([SEDPATH], [sed], [sed], [/usr/bin$PATH_SEPARATOR/bin] )
>  AC_SUBST(INODECMD)
> -AC_SUBST(OWNERCMD)
> -AC_SUBST(MODECMD)
>  AC_SUBST(STRIP_BINARIES)
>  AC_SUBST(STRIP_SHARED)
>  AC_SUBST(STRIP_STATIC)
> @@ -576,8 +568,6 @@ ${PACKAGE_NAME}:
>      Architecture           : ${CARCH}
>      Host Type              : ${CHOST}
>      File inode command     : ${INODECMD}
> -    File owner command     : ${OWNERCMD}
> -    File mode command      : ${MODECMD}
>      In-place sed command   : ${SEDPATH} ${SEDINPLACEFLAGS}
>  
>      libalpm version        : ${LIB_VERSION}
> diff --git a/meson.build b/meson.build
> index 8db8c68e..4d96e5ff 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -319,8 +319,6 @@ substs.set('BUILDSCRIPT', BUILDSCRIPT)
>  substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir'))
>  substs.set('DEBUGSUFFIX', get_option('debug-suffix'))
>  substs.set('INODECMD', inodecmd)
> -substs.set('OWNERCMD', ownercmd)
> -substs.set('MODECMD', modecmd)
>  substs.set('SEDINPLACEFLAGS', sedinplaceflags)
>  substs.set('SEDPATH', SED.path())
>  substs.set('DUFLAGS', duflags)
> diff --git a/scripts/Makefile.am b/scripts/Makefile.am
> index 7fffd93b..2964d1b7 100644
> --- a/scripts/Makefile.am
> +++ b/scripts/Makefile.am
> @@ -177,8 +177,6 @@ edit = sed \
>  	-e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \
>  	-e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \
>  	-e "s|@INODECMD[@]|$(INODECMD)|g" \
> -	-e "s|@OWNERCMD[@]|$(OWNERCMD)|g" \
> -	-e "s|@MODECMD[@]|$(MODECMD)|g" \
>  	-e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \
>  	-e 's|@SEDPATH[@]|$(SEDPATH)|g' \
>  	-e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \
>