summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-06 23:51:11 +0100
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-06 23:51:11 +0100
commitc6f1599dc9e9dc3ee9b2f18d298c19718db03d00 (patch)
tree05ab27fca1869099afe94c8f662f9a2e3d017a33
parent6961e75c7d071fb1f2f646fcd2266e1e1e29df8d (diff)
downloadmidipix_build-c6f1599dc9e9dc3ee9b2f18d298c19718db03d00.tar.bz2
midipix_build-c6f1599dc9e9dc3ee9b2f18d298c19718db03d00.tar.xz
vars/auto{conf_2_64,make_1_11_6}_host.vars: updated.
patches/autoconf_2_64_host-2.64.local.patch: added.
-rw-r--r--patches/autoconf_2_64_host-2.64.local.patch30
-rw-r--r--vars/autoconf_2_64_host.vars6
-rw-r--r--vars/automake_1_11_6_host.vars4
3 files changed, 35 insertions, 5 deletions
diff --git a/patches/autoconf_2_64_host-2.64.local.patch b/patches/autoconf_2_64_host-2.64.local.patch
new file mode 100644
index 00000000..d363cd23
--- /dev/null
+++ b/patches/autoconf_2_64_host-2.64.local.patch
@@ -0,0 +1,30 @@
+--- autoconf-2.64/bin/Makefile.in.orig 2009-07-27 04:28:43.000000000 +0100
++++ autoconf-2.64/bin/Makefile.in 2021-05-06 23:48:43.296357404 +0100
+@@ -53,10 +53,10 @@
+ # 02110-1301, USA.
+
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgdatadir = $(datadir)/@PACKAGE@-2.64
++pkgincludedir = $(includedir)/@PACKAGE@-2.64
++pkglibdir = $(libdir)/@PACKAGE@-2.64
++pkglibexecdir = $(libexecdir)/@PACKAGE@-2.64
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -283,9 +283,9 @@
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+ -e 's|@prefix[@]|$(prefix)|g' \
+- -e 's|@autoconf-name[@]|'`echo autoconf | sed '$(transform)'`'|g' \
+- -e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \
+- -e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \
++ -e 's|@autoconf-name[@]|'`echo autoconf-2.64 | sed '$(transform)'`'|g' \
++ -e 's|@autoheader-name[@]|'`echo autoheader-2.64 | sed '$(transform)'`'|g' \
++ -e 's|@autom4te-name[@]|'`echo autom4te-2.64 | sed '$(transform)'`'|g' \
+ -e 's|@M4[@]|$(M4)|g' \
+ -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \
+ -e 's|@M4_GNU[@]|$(M4_GNU)|g' \
diff --git a/vars/autoconf_2_64_host.vars b/vars/autoconf_2_64_host.vars
index 71ad75d8..4b5772a0 100644
--- a/vars/autoconf_2_64_host.vars
+++ b/vars/autoconf_2_64_host.vars
@@ -6,11 +6,11 @@ pkg_autoconf_2_64_host_install_make_post() {
local _fname="";
for _fname in \
- $(find "${PKG_DESTDIR}/bin" -type f -perm /0111) \
- "${PKG_DESTDIR}/share/autoconf" \
- "${PKG_DESTDIR}/share/info/dir"; do
+ $(find "${PKG_DESTDIR}/bin" -type f -perm /0111) \
+ "${PKG_DESTDIR}/share/autoconf"; do
rtl_fileop mv "${_fname}" "${_fname}-${PKG_VERSION}" || return 1;
done;
+ rtl_fileop rm "${PKG_DESTDIR}/share/info/dir";
for _fname in \
$(find "${PKG_DESTDIR}/share/man" -type f -name "*.[0-9]*") \
$(find "${PKG_DESTDIR}/share/info" -type f -name "*.info*"); do
diff --git a/vars/automake_1_11_6_host.vars b/vars/automake_1_11_6_host.vars
index 18586358..f042e118 100644
--- a/vars/automake_1_11_6_host.vars
+++ b/vars/automake_1_11_6_host.vars
@@ -11,14 +11,14 @@ pkg_automake_1_11_6_host_install_make_post() {
done;
for _fname in \
$(find "${PKG_DESTDIR}/bin" -type f -perm /0111 -not -name "*-${PKG_VERSION%.*}") \
- "${PKG_DESTDIR}/share/doc/automake" \
- "${PKG_DESTDIR}/share/info/dir"; do
+ "${PKG_DESTDIR}/share/doc/automake"; do
rtl_fileop mv "${_fname}" "${_fname}-${PKG_VERSION}" || return 1;
done;
for _fname in $(find "${PKG_DESTDIR}/share/man" -type f -name "*-${PKG_VERSION%.*}.[0-9]*"); do
_fname_base="${_fname##*/}";
rtl_fileop ln_symbolic "${_fname_base%%-[0-9]*}-${PKG_VERSION}.${_fname_base##*.}" "${_fname}";
done;
+ rtl_fileop rm "${PKG_DESTDIR}/share/info/dir";
for _fname in \
$(find "${PKG_DESTDIR}/share/man" -type f -name "*.[0-9]*" -not -name "*-${PKG_VERSION%.*}") \
$(find "${PKG_DESTDIR}/share/info" -type f -name "*.info*"); do