summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-02-03 02:35:33 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-02-03 02:35:33 +0000
commit5b02e1597a0c3aa9c6c6d385acea34de6e37fadf (patch)
treeeb4943c4d3bf8e07e6a390a0f6f60af9619dfd18 /vars
parent2bee8fe23a437439923f35cde08e62a1096426d3 (diff)
downloadmidipix_build-5b02e1597a0c3aa9c6c6d385acea34de6e37fadf.tar.bz2
midipix_build-5b02e1597a0c3aa9c6c6d385acea34de6e37fadf.tar.xz
vars/build.vars, patches/httpd-2.4.25.local.patch: preliminarily adds httpd v2.4.25 (via Redfoxmoon) (not built by default.)
build.sh, subr/{pkg_{build_dir,distclean,setup},rtl}.subr: adds `distclean' build step between setup and configure. vars/apr{,_util}.vars: provide ${PREFIX}/bin/${PKG_TARGET}-ap[ru]-1-config to facilitate building Apache.
Diffstat (limited to 'vars')
-rw-r--r--vars/apr.vars13
-rw-r--r--vars/apr_util.vars10
-rw-r--r--vars/build.vars10
3 files changed, 30 insertions, 3 deletions
diff --git a/vars/apr.vars b/vars/apr.vars
new file mode 100644
index 00000000..055e8c30
--- /dev/null
+++ b/vars/apr.vars
@@ -0,0 +1,13 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_apr_install_post() {
+ sed -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PREFIX}"'/bin/slibtool,' \
+ -e 's,echo "\${installbuilddir}/libtool",echo '"${PREFIX}"'/bin/slibtool,' \
+ -e 's,flags="\$flags -I\$includedir \$EXTRA_INCLUDES",flags="-I'"${PKG_PREFIX}"'/include/apr-1",' \
+ ${PKG_PREFIX}/bin/apr-1-config > ${PREFIX}/bin/${PKG_TARGET}-apr-1-config;
+ chmod +x ${PREFIX}/bin/${PKG_TARGET}-apr-1-config;
+};
+
+# vim:filetype=sh
diff --git a/vars/apr_util.vars b/vars/apr_util.vars
new file mode 100644
index 00000000..296ae712
--- /dev/null
+++ b/vars/apr_util.vars
@@ -0,0 +1,10 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_apr_util_install_post() {
+ cp -p ${PKG_PREFIX}/bin/apu-1-config \
+ ${PREFIX}/bin/${PKG_TARGET}-apu-1-config;
+};
+
+# vim:filetype=sh
diff --git a/vars/build.vars b/vars/build.vars
index 21c5625d..4d8dab83 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -492,9 +492,9 @@ LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
LEAF_PACKAGES_PACKAGES="
apk_tools bash bc bdwgc chicken clang_host coreutils cparser cron dash datamash diffutils dos2unix
ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john
-ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openssh p7zip pacman patch perl
-procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher tmux util_linux
-vim weechat wget which whois xeyes xwd zsh";
+ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openssh p7zip pacman patch perl procps_ng
+python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher tmux util_linux vim weechat
+wget which whois xeyes xwd zsh";
LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
: ${PKG_APK_TOOLS_VERSION:=2.6.8};
@@ -599,6 +599,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_HTOP_VERSION:=2.0.1};
: ${PKG_HTOP_URL:=http://hisham.hm/htop/releases/${PKG_HTOP_VERSION}/htop-${PKG_HTOP_VERSION}.tar.gz};
: ${PKG_HTOP_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
+: ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
+: ${PKG_HTTPD_VERSION:=2.4.25};
+: ${PKG_HTTPD_URL:=http://mirror.softaculous.com/apache//httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
+: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-apr=${PREFIX}/bin/${TARGET}-apr-1-config --with-apr-util=${PREFIX}/bin/${TARGET}-apu-1-config"};
: ${PKG_INETUTILS_SHA256SUM:=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37};
: ${PKG_INETUTILS_VERSION:=1.9.4};
: ${PKG_INETUTILS_URL:=https://ftp.gnu.org/gnu/inetutils/inetutils-${PKG_INETUTILS_VERSION}.tar.xz};