summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2018-08-05 18:32:32 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2018-08-05 18:32:32 +0000
commitdbe38150544d49a86aaa1ab25f7d5587d8798b43 (patch)
treed71a83f9e28bfad38869cd0fb40e0f9cdf032530
parent3029c4393cf1b96ac266cb506654def9d6432a82 (diff)
downloadmidipix_build-dbe38150544d49a86aaa1ab25f7d5587d8798b43.tar.bz2
midipix_build-dbe38150544d49a86aaa1ab25f7d5587d8798b43.tar.xz
vars/build.vars:native_packages_deps: adds libtirpc v1.0.3 (via Redfoxmoon.)
vars/build.vars:native_packages_etc: adds dante v1.4.2 (via Redfoxmoon.) patches/{dante,libtirpc}-{1.4.2,1.0.3}.local.patch: via Redfoxmoon.
-rw-r--r--patches/dante-1.4.2.local.patch98
-rw-r--r--patches/libtirpc-1.0.3.local.patch90
-rw-r--r--vars/build.vars16
3 files changed, 201 insertions, 3 deletions
diff --git a/patches/dante-1.4.2.local.patch b/patches/dante-1.4.2.local.patch
new file mode 100644
index 00000000..0a6c8c75
--- /dev/null
+++ b/patches/dante-1.4.2.local.patch
@@ -0,0 +1,98 @@
+diff -ru dante-1.4.2.orig/configure dante-1.4.2/configure
+--- dante-1.4.2.orig/configure 2017-02-03 15:17:15.000000000 +0100
++++ dante-1.4.2/configure 2018-08-04 19:01:29.524396348 +0200
+@@ -15341,10 +15341,8 @@
+ $as_echo_n "checking whether realloc with a NULL pointer calls malloc... " >&6; }
+ if test "$cross_compiling" = yes; then :
+
+-$as_echo "#define HAVE_NOMALLOC_REALLOC 1" >>confdefs.h
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5
++$as_echo "assuming yes" >&6; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -16923,8 +16921,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking read/send-side pipe system" >&5
+ $as_echo_n "checking read/send-side pipe system... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling" >&5
+-$as_echo "cross-compiling" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming send-based" >&5
++$as_echo "assuming send-based" >&6; }
++$as_echo "#define HAVE_PIPEBUFFER_SEND_BASED 1" >>confdefs.h
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -17226,13 +17225,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errorless select behavior with high timeouts" >&5
+ $as_echo_n "checking for errorless select behavior with high timeouts... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+-$as_echo "unknown" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to determine max select value, using default" >&5
+-$as_echo "$as_me: WARNING: unable to determine max select value, using default" >&2;}
+-
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling: assuming yes -- midipix specific" >&5
++$as_echo "yes" >&6; }
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_SELECT_MAXTIMEOUT $DEFAULTMAX
++#define HAVE_SELECT_MAXTIMEOUT 0
+ _ACEOF
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -23228,12 +23224,13 @@
+
+ #AC_CHECK_FUNCS will add HAVE_foo define as long as function exists,
+ #check overselves as we only want define set if function is also working.
+-ac_cv_func_pselect=no
++ac_cv_func_pselect=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working pselect()" >&5
+ $as_echo_n "checking for working pselect()... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming no" >&5
+-$as_echo "assuming no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5
++$as_echo "assuming yes" >&6; }
++$as_echo "#define HAVE_PSELECT 1" >>confdefs.h
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -23286,8 +23283,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sockatmark" >&5
+ $as_echo_n "checking for working sockatmark... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming no" >&5
+-$as_echo "assuming no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5
++$as_echo "assuming yes" >&6; }
++$as_echo "#define HAVE_SOCKATMARK 1" >>confdefs.h
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -23888,8 +23886,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC clock_gettime() support" >&5
+ $as_echo_n "checking for CLOCK_MONOTONIC clock_gettime() support... " >&6; }
+ if test "$cross_compiling" = yes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming no" >&5
+-$as_echo "assuming no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5
++$as_echo "assuming yes" >&6; }
++$as_echo "#define HAVE_CLOCK_GETTIME_MONOTONIC 1" >>confdefs.h
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+diff -ru dante-1.4.2.orig/dlib/Makefile.in dante-1.4.2/dlib/Makefile.in
+--- dante-1.4.2.orig/dlib/Makefile.in 2017-02-03 15:17:27.000000000 +0100
++++ dante-1.4.2/dlib/Makefile.in 2018-08-05 01:50:52.803073351 +0200
+@@ -409,7 +409,7 @@
+ ../libscompat/pselect.c ../libscompat/setproctitle.c \
+ ../libscompat/strlcpy.c ../libscompat/strvis.c \
+ ../libscompat/vsyslog.c ../libscompat/issetugid.c
+-libdsocks_la_LDFLAGS = -avoid-version -all-dynamic @MAPOPT@
++libdsocks_la_LDFLAGS = -avoid-version @MAPOPT@
+ libdsocks_la_LIBADD = @LIBDSCSRC@ @DLIBDEPS@ @LIBSCOMPAT@
+ libdsocks_la_DEPENDENCIES = Makefile.am _reconf @LIBDSCSRC@ \
+ $(am__append_1)
diff --git a/patches/libtirpc-1.0.3.local.patch b/patches/libtirpc-1.0.3.local.patch
new file mode 100644
index 00000000..535880fe
--- /dev/null
+++ b/patches/libtirpc-1.0.3.local.patch
@@ -0,0 +1,90 @@
+diff -ru libtirpc-1.0.3.orig/src/bindresvport.c libtirpc-1.0.3/src/bindresvport.c
+--- libtirpc-1.0.3.orig/src/bindresvport.c 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/src/bindresvport.c 2018-08-04 19:37:31.972078008 +0200
+@@ -61,7 +61,7 @@
+ return bindresvport_sa(sd, (struct sockaddr *)sin);
+ }
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__midipix__)
+
+ #define STARTPORT 600
+ #define LOWPORT 512
+diff -ru libtirpc-1.0.3.orig/src/clnt_dg.c libtirpc-1.0.3/src/clnt_dg.c
+--- libtirpc-1.0.3.orig/src/clnt_dg.c 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/src/clnt_dg.c 2018-08-04 19:41:06.325266026 +0200
+@@ -54,12 +54,16 @@
+ #include <err.h>
+ #include "rpc_com.h"
+
+-#ifdef IP_RECVERR
++#if defined(IP_RECVERR) && !defined(__midipix__)
+ #include <asm/types.h>
+ #include <linux/errqueue.h>
+ #include <sys/uio.h>
+ #endif
+
++#ifdef __midipix__
++#include <sys/uio.h>
++#endif
++
+
+ #define MAX_DEFAULT_FDS 20000
+
+@@ -421,7 +425,7 @@
+ }
+ break;
+ }
+-#ifdef IP_RECVERR
++#if defined(IP_RECVERR) && !defined(__midipix__)
+ if (fd.revents & POLLERR)
+ {
+ struct msghdr msg;
+diff -ru libtirpc-1.0.3.orig/src/rtime.c libtirpc-1.0.3/src/rtime.c
+--- libtirpc-1.0.3.orig/src/rtime.c 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/src/rtime.c 2018-08-04 19:47:49.089270334 +0200
+@@ -46,7 +46,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
+diff -ru libtirpc-1.0.3.orig/src/svc_run.c libtirpc-1.0.3/src/svc_run.c
+--- libtirpc-1.0.3.orig/src/svc_run.c 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/src/svc_run.c 2018-08-04 19:48:02.569155655 +0200
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+
+
+ #include <rpc/rpc.h>
+diff -ru libtirpc-1.0.3.orig/tirpc/reentrant.h libtirpc-1.0.3/tirpc/reentrant.h
+--- libtirpc-1.0.3.orig/tirpc/reentrant.h 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/tirpc/reentrant.h 2018-08-04 19:23:48.165632436 +0200
+@@ -36,7 +36,7 @@
+ * These definitions are only guaranteed to be valid on Linux.
+ */
+
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__midipix__)
+
+ #include <pthread.h>
+
+diff -ru libtirpc-1.0.3.orig/tirpc/rpc/types.h libtirpc-1.0.3/tirpc/rpc/types.h
+--- libtirpc-1.0.3.orig/tirpc/rpc/types.h 2018-03-14 14:55:12.000000000 +0100
++++ libtirpc-1.0.3/tirpc/rpc/types.h 2018-08-04 19:18:35.415064046 +0200
+@@ -66,7 +66,7 @@
+ #define mem_free(ptr, bsize) free(ptr)
+
+
+-#if defined __APPLE_CC__ || defined __FreeBSD__
++#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
+ # define __u_char_defined
+ # define __daddr_t_defined
+ #endif
diff --git a/vars/build.vars b/vars/build.vars
index 5abcecd5..53c2cee9 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -402,7 +402,7 @@ libunistring gnutls curl libz lmdb libpng libjpeg_turbo tiff giflib libffi
gdbm geoip pcre glib gzip libarchive libatomic_ops musl_compat libbsd
libpipeline libevent libfetch libogg libvorbis libtheora libsndfile libgpg_error libassuan
libfirm libgcrypt libksba libudns lua ncurses ncursestw ncursesw
-libreadline npth popt file xz zstd rpm libsolv tdnf shared_mime_info
+libreadline libtirpc npth popt file xz zstd rpm libsolv tdnf shared_mime_info
sqlite3 w32api w32lib libuv cmake qrencode util_linux slang";
NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
@@ -584,6 +584,10 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
: ${PKG_LIBREADLINE_VERSION:=7.0};
: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};
: ${PKG_LIBREADLINE_CONFIGURE_ARGS_EXTRA:="--with-curses --disable-static"};
+: ${PKG_LIBTIRPC_SHA256SUM:=86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e};
+: ${PKG_LIBTIRPC_VERSION:=1.0.3};
+: ${PKG_LIBTIRPC_URL:=https://sourceforge.mirrorservice.org/l/li/libtirpc/libtirpc/${PKG_LIBTIRPC_VERSION}/libtirpc-${PKG_LIBTIRPC_VERSION}.tar.bz2};
+: ${PKG_LIBTIRPC_CONFIGURE_ARGS_EXTRA:="--disable-gssapi"};
: ${PKG_NPTH_SHA256SUM:=294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2};
: ${PKG_NPTH_VERSION:=1.5};
: ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
@@ -1077,8 +1081,9 @@ patch patchutils perl python2 python3 ruby smallbasic tcl";
#
# Packages list native_packages_etc
NATIVE_PACKAGES_ETC_PACKAGES="
-ca_certificates cron debianutils hexcurse htop infounzip infozip jamvm classpath john less mc mintty nano ncdu
-p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xcowsay xeyes xorriso xterm xwd";
+ca_certificates cron dante debianutils hexcurse htop infounzip infozip jamvm classpath
+john less mc mintty nano ncdu p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xcowsay
+xeyes xorriso xterm xwd";
: ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"};
: ${PKG_CA_CERTIFICATES_IN_TREE:=1};
: ${PKG_CA_CERTIFICATES_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include};
@@ -1087,6 +1092,11 @@ p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xcowsay xeyes xorriso xterm xwd
: ${PKG_CRON_URLS_GIT:="pkg-cron=https://github.com/lalbornoz/pkg-cron@master"};
: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
: ${PKG_CRON_IN_TREE:=1};
+: ${PKG_DANTE_SHA256SUM:=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7};
+: ${PKG_DANTE_VERSION:=1.4.2};
+: ${PKG_DANTE_URL:=http://www.inet.no/dante/files/dante-${PKG_DANTE_VERSION}.tar.gz};
+: ${PKG_DANTE_CONFIGURE_ARGS_EXTRA:="ac_cv_func_sched_setscheduler=no --without-libwrap LIBS=-ltirpc"};
+: ${PKG_DANTE_IN_TREE:=1};
: ${PKG_DEBIANUTILS_SHA256SUM:=db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73};
: ${PKG_DEBIANUTILS_VERSION:=4.8.6};
: ${PKG_DEBIANUTILS_URL:=http://http.debian.net/debian/pool/main/d/debianutils/debianutils_${PKG_DEBIANUTILS_VERSION}.tar.xz};