From 80332505cb5ffb75c400ca02bfd80deed7d09f5a Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 5 Aug 2019 01:17:13 +0000 Subject: user/libverto: Fix build with dash as /bin/sh Signed-off-by: Samuel Holland --- user/libverto/APKBUILD | 6 ++- user/libverto/dash.patch | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 user/libverto/dash.patch (limited to 'user') diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD index 0e21014ab..f0de5eeec 100644 --- a/user/libverto/APKBUILD +++ b/user/libverto/APKBUILD @@ -9,7 +9,8 @@ arch="all" license="MIT" makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool" subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib" -source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz + dash.patch" prepare() { default_prepare @@ -44,4 +45,5 @@ libev() { _mv_backend libev; } libevent() { _mv_backend libevent; } glib() { _mv_backend glib; } -sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8 libverto-0.3.1.tar.gz" +sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8 libverto-0.3.1.tar.gz +414242414a71c36744be07e034a75d3c95d7d41682eb8431115b25e2b09040939ee3aaaaee8c9ba303d4f5ab21ae39de2843b6e137659deba2bc0befda208a8f dash.patch" diff --git a/user/libverto/dash.patch b/user/libverto/dash.patch new file mode 100644 index 000000000..f506c5dba --- /dev/null +++ b/user/libverto/dash.patch @@ -0,0 +1,131 @@ +--- libverto-0.3.1/configure.ac ++++ libverto-0.3.1/configure.ac +@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent], + + # Ensure that if a builtin is chosen only one is built + BUILTIN_MODULE= +-if test x$WITH_GLIB == xbuiltin; then ++if test x$WITH_GLIB = xbuiltin; then + BUILTIN_MODULE=glib + WITH_LIBEV=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEV == xbuiltin; then ++elif test x$WITH_LIBEV = xbuiltin; then + BUILTIN_MODULE=libev + WITH_LIBGLIB=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEVENT == xbuiltin; then ++elif test x$WITH_LIBEVENT = xbuiltin; then + BUILTIN_MODULE=libevent + WITH_LIBGLIB=no + WITH_LIBEV=no + WITH_TEVENT=no +-elif test x$WITH_TEVENT == xbuiltin; then ++elif test x$WITH_TEVENT = xbuiltin; then + BUILTIN_MODULE=tevent + WITH_GLIB=no + WITH_LIBEV=no +@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then + fi + + # Ensure that there is only one default (convert duplicate default to yes) +-if test x$WITH_GLIB == xdefault; then ++if test x$WITH_GLIB = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [glib]) +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEV == xdefault; then ++if test x$WITH_LIBEV = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libev]) +- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEVENT == xdefault; then ++if test x$WITH_LIBEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_TEVENT == xdefault; then ++if test x$WITH_TEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [tevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes + fi + + BUILD_GLIB=no +@@ -151,7 +151,7 @@ BUILD_TEVENT=no + if test x$WITH_GLIB != xno; then + PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], + [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) +- if test x$BUILD_GLIB == xauto; then ++ if test x$BUILD_GLIB = xauto; then + BUILD_GLIB=yes + fi + fi +@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then + ), + [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] + ) +- if test x$BUILD_LIBEV == xauto; then ++ if test x$BUILD_LIBEV = xauto; then + BUILD_LIBEV=yes + fi + fi +@@ -173,7 +173,7 @@ fi + if test x$WITH_LIBEVENT != xno; then + PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], + [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) +- if test x$BUILD_LIBEVENT == xauto; then ++ if test x$BUILD_LIBEVENT = xauto; then + BUILD_LIBEVENT=yes + fi + fi +@@ -181,19 +181,19 @@ fi + if test x$WITH_TEVENT != xno; then + PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT], + [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")]) +- if test x$BUILD_TEVENT == xauto; then ++ if test x$BUILD_TEVENT = xauto; then + BUILD_TEVENT=yes + fi + fi + +-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) +-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) +-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) +-AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno]) +-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) +-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) +-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) +-AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent]) ++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) ++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) ++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) ++AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno]) ++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) ++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) ++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) ++AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent]) + + AC_MSG_NOTICE() + AC_MSG_NOTICE([BUILD CONFIGURATION]) -- cgit v1.2.3-60-g2f50 From acf4868754dfb362e55046bb3e857aa14fa3af6d Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 5 Aug 2019 01:20:37 +0000 Subject: user/lsof: Update dead source URL Signed-off-by: Samuel Holland --- user/lsof/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user') diff --git a/user/lsof/APKBUILD b/user/lsof/APKBUILD index a7e0c4768..370d8c7a7 100644 --- a/user/lsof/APKBUILD +++ b/user/lsof/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="zlib-acknowledgement" subpackages="$pkgname-doc" makedepends="linux-headers cmd:which utmps-dev" -source="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz +source="http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz utmps.patch test-enable-suite.patch test-linux-sysmacros.patch -- cgit v1.2.3-60-g2f50 From 5355ba6688a9b4dee041bcdd2ebac9dd4e46bc3d Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 5 Aug 2019 01:20:56 +0000 Subject: user/libexecinfo: Fix domain for fetching with HTTPS Signed-off-by: Samuel Holland --- user/libexecinfo/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user') diff --git a/user/libexecinfo/APKBUILD b/user/libexecinfo/APKBUILD index 2c357a177..6951797d8 100644 --- a/user/libexecinfo/APKBUILD +++ b/user/libexecinfo/APKBUILD @@ -10,7 +10,7 @@ license="BSD-2-Clause" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2 +source="https://pkg.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2 10-execinfo.patch 20-define-gnu-source.patch 30-linux-makefile.patch -- cgit v1.2.3-60-g2f50 From c3a4b6cb60e71fc6eba379e858b846859cd46e9a Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 5 Aug 2019 01:21:25 +0000 Subject: user/boost: Fix build on armv7 Signed-off-by: Samuel Holland --- user/boost/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user') diff --git a/user/boost/APKBUILD b/user/boost/APKBUILD index 2a8a89786..31045eea4 100644 --- a/user/boost/APKBUILD +++ b/user/boost/APKBUILD @@ -65,7 +65,7 @@ prepare() { } case "$CARCH" in - armhf|aarch64) _boostarch=arm ;; + armhf|armv7|aarch64) _boostarch=arm ;; ppc64*) _boostarch=ppc ;; s390x) _boostarch=s390 ;; pmmx) _boostarch=x86 ;; -- cgit v1.2.3-60-g2f50