diff options
| -rw-r--r-- | build-aux/edit-script.sh.in | 2 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 |
4 files changed, 0 insertions, 24 deletions
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 2f345b5d..57d9fddb 100644 --- a/configure.ac +++ b/configure.ac @@ -348,24 +348,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="" @@ -377,8 +371,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) @@ -570,8 +562,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 b810e2fb..66a6385c 100644 --- a/meson.build +++ b/meson.build @@ -255,8 +255,6 @@ add_project_arguments('-include', 'config.h', language : 'c') 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' @@ -264,8 +262,6 @@ strip_static = '--strip-debug' os = host_machine.system() if os.startswith('darwin') 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 = '' @@ -273,8 +269,6 @@ if os.startswith('darwin') strip_static = '-s' elif os.contains('bsd') or os == 'dragonfly' inodecmd = 'stat -f \'%i %n\'' - ownercmd = 'stat -f \'%u:%g\'' - modecmd = 'stat -f \'%lp\'' default_sedinplaceflags = ' -i \'\'' default_duflags = ' -sk' endif @@ -314,8 +308,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) @@ -471,8 +463,6 @@ message('\n '.join([ ' Architecture : @0@'.format(carch), ' Host Type : @0@'.format(chost), ' File inode command : @0@'.format(inodecmd), - ' File owner command : @0@'.format(ownercmd), - ' File mode command : @0@'.format(modecmd), ' 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), diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6628e8cf..4eda9083 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -174,8 +174,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' \ |