aboutsummaryrefslogtreecommitdiff
path: root/common/hooks/pre-configure
diff options
context:
space:
mode:
authorJuan RP <xtraeme@voidlinux.eu>2015-04-21 08:48:30 +0000
committerJuan RP <xtraeme@voidlinux.eu>2015-04-21 08:48:30 +0000
commit0be33d385a67bd9ac5df25a161e32386591204cd (patch)
tree0467177f83028b1ac4dbe953a36ba758ae2a4b90 /common/hooks/pre-configure
parent62a643d5c771eb5f645e80151428cade0c55486f (diff)
downloadvoid-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar.gz
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar.bz2
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar.lz
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar.xz
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.tar.zst
void-packages-0be33d385a67bd9ac5df25a161e32386591204cd.zip
xbps-src: move wrappers to common/wrappers.
Diffstat (limited to 'common/hooks/pre-configure')
-rw-r--r--common/hooks/pre-configure/02-script-wrapper.sh5
-rw-r--r--common/hooks/pre-configure/install-wrapper44
-rw-r--r--common/hooks/pre-configure/ldconfig-wrapper4
3 files changed, 2 insertions, 51 deletions
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 17c80e4a568..2328f0a4571 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -80,9 +80,8 @@ _EOF
}
install_wrappers() {
- for f in install ldconfig; do
- install -m0755 ${XBPS_COMMONDIR}/hooks/pre-configure/${f}-wrapper \
- ${XBPS_WRAPPERDIR}/${f}
+ for f in ${XBPS_COMMONDIR}/wrappers/*.sh; do
+ install -m0755 ${f} ${XBPS_WRAPPERDIR}/$(basename ${f%.sh})
done
}
diff --git a/common/hooks/pre-configure/install-wrapper b/common/hooks/pre-configure/install-wrapper
deleted file mode 100644
index 82b61c27df6..00000000000
--- a/common/hooks/pre-configure/install-wrapper
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-# install-wrapper - run install(1), but never strip or chown
-set -e
-
-# taken from install (GNU coreutils) 8.23
-opts='bcCdDg:m:o:psS:t:TvZ'
-longopts='backup::,compare,directory,group:,mode:,owner:,preserve-timestamps,\
-strip:,strip-program:,suffix:,target-directory:,no-target-directory,verbose,\
-preserve-context,context::,help,version'
-
-parsed="$(getopt -o "$opts" --long "$longopts" -n 'install-wrapper' -- "$@")"
-eval set -- "$parsed"
-
-iopts=()
-while :; do
- case "$1" in
- -s|--strip)
- echo "install-wrapper: overriding call to strip(1)." 1>&2
- iopts+=("$1" --strip-program=true)
- shift;;
- --strip-program)
- echo "install-wrapper: dropping strip program '$2'." 1>&2
- shift 2;;
- -g|--group|-o|--owner)
- echo "install-wrapper: dropping option $1 $2." 1>&2
- shift 2;;
- -b|-c|-C|--compare|-d|--directory|-D|-p|--preserve-timestamps|\
- -T|--no-target-directory|-v|--verbose|--preserve-context|-Z|\
- --help|--version)
- iopts+=("$1")
- shift;;
- -m|--mode|-S|--suffix|-t|--target-directory|--backup|--context)
- iopts+=("$1" "$2")
- shift 2;;
- --)
- shift
- break;;
- *)
- echo 'cant happen, report a bug' 1>&2
- exit 111;;
- esac
-done
-
-exec /usr/bin/install "${iopts[@]}" -- "$@"
diff --git a/common/hooks/pre-configure/ldconfig-wrapper b/common/hooks/pre-configure/ldconfig-wrapper
deleted file mode 100644
index f8392bd0178..00000000000
--- a/common/hooks/pre-configure/ldconfig-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "ldconfig-wrapper: ignoring arguments: $@"
-exit 0