summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2019-03-29 16:15:07 -1000
committerSam Bingner <sam@bingner.com>2019-03-29 16:15:07 -1000
commitf420962cfa66e1cba88f7e0b67de5f081b425ef5 (patch)
treee5fb9fca204bd553c0f8a15e9c2d42a2e02e346b /data
parentf0d949436389a5851c42defba484c4454e351bf2 (diff)
Update dpkg to have the proper path for perl
Diffstat (limited to 'data')
-rw-r--r--data/_dpkg/make.sh5
-rw-r--r--data/dpkg-perl/make.sh11
-rw-r--r--data/dpkg/make.sh6
3 files changed, 14 insertions, 8 deletions
diff --git a/data/_dpkg/make.sh b/data/_dpkg/make.sh
index 69af2ba92..ce6a3caa1 100644
--- a/data/_dpkg/make.sh
+++ b/data/_dpkg/make.sh
@@ -1,6 +1,9 @@
pkg:setup
+pkg: cp %/macho.mgc .
+pkg: cp %/sign.{c,h} lib/dpkg/
+autoreconf
#autoconf
#cp -a libcompat/obstack.[ch] lib
-pkg:configure --with-admindir=/var/lib/dpkg --disable-start-stop-daemon --disable-nls --sysconfdir=/etc --disable-linker-optimisations dpkg_cv_va_copy=yes --enable-static=yes --enable-shared=no --with-dpkg-deb-compressor=gzip TAR=tar LIBDIR_PERL="$(echo "$(PKG_WORK_ perl)"/perl-5*/miniperl_top)" PERL=/usr/bin/perl
+pkg:configure --with-admindir=/var/lib/dpkg --disable-start-stop-daemon --disable-nls --sysconfdir=/etc --disable-linker-optimisations dpkg_cv_va_copy=yes --enable-static=yes --enable-shared=no --with-dpkg-deb-compressor=gzip --with-logdir=/var/log/dpkg TAR=tar PERL_LIBDIR="$("$(PKG_WORK_ perl)"/perl-5*/miniperl_top -e 'use Config; print $Config{vendorlib};')" PERL=/usr/bin/perl
pkg:make
pkg:install
diff --git a/data/dpkg-perl/make.sh b/data/dpkg-perl/make.sh
index 6aaa19e37..85b166be0 100644
--- a/data/dpkg-perl/make.sh
+++ b/data/dpkg-perl/make.sh
@@ -1,10 +1,11 @@
-pkg: mkdir -p /usr/share
-cp -a "$(PKG_DEST_ _dpkg)/usr/share/perl5" "${PKG_DEST}/usr/share"
+LIBDIR="$("$(PKG_WORK_ perl)"/perl-5*/miniperl_top -e 'use Config; print $Config{vendorlib};')"
+pkg: mkdir -p "/${LIBDIR}"
+cp -a "$(PKG_DEST_ _dpkg)/${LIBDIR}" "${PKG_DEST}/${LIBDIR}"
pushd "$(PKG_DEST_ _dpkg)/"
-grep -Erl '#! ?/usr/bin/perl' . | while read -r line; do
+grep -Erl '#!\s?/usr/bin/perl' . | while read -r line; do
dir=$(dirname $line)
- pkg: mkdir -p /${dir}
- pkg: cp -a $line /${dir}
+ pkg: mkdir -p "/${dir}"
+ pkg: cp -a "$line" "/${dir}"
done
popd
pkg: rm -rf /{usr,var}/lib{,exec}/dpkg/methods
diff --git a/data/dpkg/make.sh b/data/dpkg/make.sh
index d5b539653..d43867069 100644
--- a/data/dpkg/make.sh
+++ b/data/dpkg/make.sh
@@ -1,6 +1,8 @@
cp -a "$(PKG_DEST_ _dpkg)/." "${PKG_DEST}/"
-pkg: rm -rf /usr/share/perl5
-pkg: grep -Erl '#! ?/usr/bin/perl' / | while read -r line; do
+pkg: rm -rf "$("$(PKG_WORK_ perl)"/perl-5*/miniperl_top -e 'use Config; print $Config{vendorlib};')"
+pkg: grep -Erl '#!\s?/usr/bin/perl' / | while read -r line; do
+ echo rm -f "${line}"
rm -f "${line}"
done
pkg: rm -rf /{usr,var}/lib{,exec}/dpkg/methods
+pkg: mkdir -p /var/log/dpkg