summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Torres <santiago@archlinux.org>2019-03-12 02:18:16 +0100
committerAllan McRae <allan@archlinux.org>2019-03-19 03:07:15 +0100
commit226d2c124884c7318b7fb86c2e6bdf792eddd1a9 (patch)
tree151d9df3037ab499ff7771433b569657f2a83967
parentbbfb75fd292e3f2818cdc0eae68c292bb3fbc50b (diff)
downloadpacman-226d2c124884c7318b7fb86c2e6bdf792eddd1a9.tar.gz
pacman-226d2c124884c7318b7fb86c2e6bdf792eddd1a9.tar.xz
drop DU* config variables
Since DUFLAGS and DUPATH are not needed anymore remove them from the source Signed-off-by: Santiago Torres <santiago@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--build-aux/edit-script.sh.in2
-rw-r--r--configure.ac10
-rw-r--r--meson.build11
-rw-r--r--meson_options.txt3
-rw-r--r--scripts/Makefile.am2
5 files changed, 0 insertions, 28 deletions
diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in
index a25218cb..d5495057 100644
--- a/build-aux/edit-script.sh.in
+++ b/build-aux/edit-script.sh.in
@@ -21,8 +21,6 @@ mode=$3
-e "s|@INODECMD[@]|@INODECMD@|g" \
-e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \
-e "s|@SEDPATH[@]|@SEDPATH@|g" \
- -e "s|@DUFLAGS[@]|@DUFLAGS@|g" \
- -e "s|@DUPATH[@]|@DUPATH@|g" \
-e "s|@configure_input[@]|Generated from ${input##*/}; do not edit by hand.|g" \
"$input" >"$output"
diff --git a/configure.ac b/configure.ac
index 57d9fddb..2f091f69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,7 +345,6 @@ AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h>
GCC_VISIBILITY_CC
# Host-dependant definitions
-DEFAULT_DUFLAGS=" -sk --apparent-size"
DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i"
INODECMD="stat -c '%i %n'"
STRIP_BINARIES="--strip-all"
@@ -355,32 +354,23 @@ case "${host_os}" in
*bsd*)
INODECMD="stat -f '%i %N'"
DEFAULT_SEDINPLACEFLAGS=" -i \"\""
- DEFAULT_DUFLAGS=" -sk"
;;
darwin*)
host_os_darwin=yes
INODECMD="/usr/bin/stat -f '%i %N'"
DEFAULT_SEDINPLACEFLAGS=" -i ''"
- DEFAULT_DUFLAGS=" -sk"
STRIP_BINARIES=""
STRIP_SHARED="-S"
STRIP_STATIC="-S"
;;
esac
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(STRIP_BINARIES)
AC_SUBST(STRIP_SHARED)
AC_SUBST(STRIP_STATIC)
-# Flags for du
-if test "${DUFLAGS+set}" != "set"; then
- DUFLAGS="${DEFAULT_DUFLAGS}"
-fi
-AC_ARG_VAR(DUFLAGS, [flags for du, overriding the default])
-
# Flags for sed in place
if test "${SEDINPLACEFLAGS+set}" != "set"; then
SEDINPLACEFLAGS="${DEFAULT_SEDINPLACEFLAGS}"
diff --git a/meson.build b/meson.build
index 66a6385c..d443a2b3 100644
--- a/meson.build
+++ b/meson.build
@@ -252,7 +252,6 @@ config_h = configure_file(
configuration : conf)
add_project_arguments('-include', 'config.h', language : 'c')
-default_duflags = ' -sk --apparent-size'
default_sedinplaceflags = ' --follow-symlinks -i'
inodecmd = 'stat -c \'%i %n\''
strip_binaries = '--strip-all'
@@ -263,19 +262,12 @@ os = host_machine.system()
if os.startswith('darwin')
inodecmd = '/usr/bin/stat -f \'%i %n\''
default_sedinplaceflags = ' -i \'\''
- default_duflags = ' -sk'
strip_binaries = ''
strip_shared = '-s'
strip_static = '-s'
elif os.contains('bsd') or os == 'dragonfly'
inodecmd = 'stat -f \'%i %n\''
default_sedinplaceflags = ' -i \'\''
- default_duflags = ' -sk'
-endif
-
-duflags = get_option('duflags')
-if duflags == 'autodetect'
- duflags = default_duflags
endif
sedinplaceflags = get_option('sedinplaceflags')
@@ -310,8 +302,6 @@ substs.set('DEBUGSUFFIX', get_option('debug-suffix'))
substs.set('INODECMD', inodecmd)
substs.set('SEDINPLACEFLAGS', sedinplaceflags)
substs.set('SEDPATH', SED.path())
-substs.set('DUFLAGS', duflags)
-substs.set('DUPATH', DU.path())
substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR)
substs.set('STRIP_BINARIES', strip_binaries)
substs.set('STRIP_SHARED', strip_shared)
@@ -463,7 +453,6 @@ message('\n '.join([
' Architecture : @0@'.format(carch),
' Host Type : @0@'.format(chost),
' File inode command : @0@'.format(inodecmd),
- ' Directory size command : @0@ @1@'.format(DU.path(), duflags),
' In-place sed command : @0@ @1@'.format(SED.path(), sedinplaceflags),
' libalpm version : @0@'.format(libalpm_version),
' pacman version : @0@'.format(PACKAGE_VERSION),
diff --git a/meson_options.txt b/meson_options.txt
index bf3fc22d..ffa4ddff 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -54,8 +54,5 @@ option('i18n', type : 'boolean', value : true,
description : 'enable localization of pacman, libalpm and scripts')
# tools
-option('duflags', type : 'string', value : 'autodetect',
- description : 'flags to pass to du to measure file size')
-
option('sedinplaceflags', type : 'string', value : 'auto',
description : 'flags to pass to sed to edit a file in-place')
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4eda9083..2c743e82 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -176,8 +176,6 @@ edit = sed \
-e "s|@INODECMD[@]|$(INODECMD)|g" \
-e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \
-e 's|@SEDPATH[@]|$(SEDPATH)|g' \
- -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \
- -e 's|@DUPATH[@]|$(DUPATH)|g' \
-e 's|@SCRIPTNAME[@]|$@|g' \
-e 's|@configure_input[@]|Generated from $<; do not edit by hand.|g'