From f27e6c73690f3dd3f560f8e1b3acc21769b26a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 8 Mar 2017 14:40:50 +0000 Subject: vars/build.vars: fixes mtr. subr/pkg_autoconf.subr: include `bootstrap.sh' in the list of pre-autoconf scripts to run. patches/mtr.midipix.patch: fix incorrect name. --- patches/mtr.git.local.patch | 28 ++++++++++++++++++++++++++++ patches/mtr.midipix.patch | 28 ---------------------------- subr/pkg_autoconf.subr | 2 +- vars/build.vars | 4 ++-- 4 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 patches/mtr.git.local.patch delete mode 100644 patches/mtr.midipix.patch diff --git a/patches/mtr.git.local.patch b/patches/mtr.git.local.patch new file mode 100644 index 00000000..a5ab92b1 --- /dev/null +++ b/patches/mtr.git.local.patch @@ -0,0 +1,28 @@ +diff -ru mtr.orig/Makefile.am mtr/Makefile.am +--- mtr.orig/Makefile.am 2017-03-02 12:55:53.968328160 +0100 ++++ mtr/Makefile.am 2017-03-02 13:02:10.645991226 +0100 +@@ -41,8 +41,8 @@ + PATHFILES += man/mtr.8 man/mtr-packet.8 + + install-exec-hook: +- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ +- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet ++# `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ ++# || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet + + mtr_SOURCES = ui/mtr.c ui/mtr.h \ + ui/net.c ui/net.h \ +diff -ru mtr.orig/packet/platform.h mtr/packet/platform.h +--- mtr.orig/packet/platform.h 2017-03-02 12:55:53.968328160 +0100 ++++ mtr/packet/platform.h 2017-03-02 13:03:59.185316954 +0100 +@@ -40,6 +40,10 @@ + + #define PLATFORM_FREEBSD + ++#elif defined(__midipix__) ++ ++#define PLATFORM_MIDIPIX ++ + #elif defined(__unix__) + + #define PLATFORM_UNIX_UNKNOWN diff --git a/patches/mtr.midipix.patch b/patches/mtr.midipix.patch deleted file mode 100644 index a5ab92b1..00000000 --- a/patches/mtr.midipix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru mtr.orig/Makefile.am mtr/Makefile.am ---- mtr.orig/Makefile.am 2017-03-02 12:55:53.968328160 +0100 -+++ mtr/Makefile.am 2017-03-02 13:02:10.645991226 +0100 -@@ -41,8 +41,8 @@ - PATHFILES += man/mtr.8 man/mtr-packet.8 - - install-exec-hook: -- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ -- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet -+# `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ -+# || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet - - mtr_SOURCES = ui/mtr.c ui/mtr.h \ - ui/net.c ui/net.h \ -diff -ru mtr.orig/packet/platform.h mtr/packet/platform.h ---- mtr.orig/packet/platform.h 2017-03-02 12:55:53.968328160 +0100 -+++ mtr/packet/platform.h 2017-03-02 13:03:59.185316954 +0100 -@@ -40,6 +40,10 @@ - - #define PLATFORM_FREEBSD - -+#elif defined(__midipix__) -+ -+#define PLATFORM_MIDIPIX -+ - #elif defined(__unix__) - - #define PLATFORM_UNIX_UNKNOWN diff --git a/subr/pkg_autoconf.subr b/subr/pkg_autoconf.subr index e8bf0572..6ceec26b 100644 --- a/subr/pkg_autoconf.subr +++ b/subr/pkg_autoconf.subr @@ -15,7 +15,7 @@ pkg_autoconf() { -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\ && [ ! -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]; then - for __ in bootstrap autogen.sh ""; do + for __ in bootstrap bootstrap.sh autogen.sh ""; do if [ -z "${__}" ]; then (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf)\ || exit 1 && break; diff --git a/vars/build.vars b/vars/build.vars index ee302814..e3efb49f 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -702,8 +702,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MKSH_NO_MAKE_INSTALL:=1}; : ${PKG_MKSH_SUBDIR:=${PKG_MKSH_BUILD_DIR}}; : ${PKG_MTR_URLS_GIT:="mtr.git=https://github.com/traviscross/mtr.git@master"}; -: ${PKG_MTR_BUILD_DIR:="mtr.git"}; -: ${PKG_MTR_DISABLED:=1}; +: ${PKG_MTR_BUILD_DIR:=mtr.git}; +: ${PKG_MTR_SUBDIR:=${PKG_MTR_BUILD_DIR}}; : ${PKG_NANO_SHA256SUM:=b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee}; : ${PKG_NANO_VERSION:=2.5.3}; : ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz}; -- cgit v1.2.3