summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2021-03-15 13:43:39 +0100
committerLars Wendler <polynomial-c@gentoo.org>2021-03-15 13:43:39 +0100
commitf00e032a6c338c13afbdd6358e2371f12b5dc782 (patch)
tree3684bd037471aa5baf481b83eb8241d6ece4da78 /dev-libs/tntnet
parentsys-block/open-iscsi: Removed old (diff)
downloadgentoo-f00e032a6c338c13afbdd6358e2371f12b5dc782.tar.gz
gentoo-f00e032a6c338c13afbdd6358e2371f12b5dc782.tar.bz2
gentoo-f00e032a6c338c13afbdd6358e2371f12b5dc782.zip
dev-libs/tntnet: Fixed build with >=sys-devel/autoconf-2.70
Bug: https://bugs.gentoo.org/775479 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-libs/tntnet')
-rw-r--r--dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch78
-rw-r--r--dev-libs/tntnet/tntnet-3.0.ebuild4
2 files changed, 82 insertions, 0 deletions
diff --git a/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..6e25e683da1c
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
@@ -0,0 +1,78 @@
+diff --git a/configure.ac b/configure.ac
+index 0c7732c4..52227db0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,21 +74,21 @@ AC_CHECK_HEADERS([sys/sendfile.h])
+ # optional components
+ #
+ AC_ARG_ENABLE([server],
+- AS_HELP_STRING([--disable-server], [disable building tntnet server]),
++ [AS_HELP_STRING([--disable-server], [disable building tntnet server])],
+ [enable_server=$enableval],
+ [enable_server=yes])
+
+ AM_CONDITIONAL(MAKE_SERVER, test x$enable_server = xyes)
+
+ AC_ARG_ENABLE([sdk],
+- AS_HELP_STRING([--disable-sdk], [disable building sdk]),
++ [AS_HELP_STRING([--disable-sdk], [disable building sdk])],
+ [enable_sdk=$enableval],
+ [enable_sdk=yes])
+
+ AM_CONDITIONAL(MAKE_SDK, test x$enable_sdk = xyes)
+
+ AC_ARG_ENABLE([demos],
+- AS_HELP_STRING([--enable-demos], [enable building demos]),
++ [AS_HELP_STRING([--enable-demos], [enable building demos])],
+ [enable_demos=$enableval],
+ [enable_demos=no])
+
+@@ -105,17 +105,16 @@ AS_IF([test "$enable_demos" = "yes"],
+ )
+
+ AC_ARG_WITH([md2man],
+- AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])
++ [AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])],
+ [with_md2man=$withval])
+
+ AS_IF(
+ [test "$with_md2man"],
+- AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
++ [AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
+ AS_IF(
+ [test -z "$MD2MAN"],
+ AC_MSG_ERROR([go-md2man not found])
+- )
+-
++ )]
+ )
+
+ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+@@ -125,21 +124,15 @@ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+ #
+ AC_CHECK_FUNCS([setenv])
+
+-case "${host_cpu}-${host_os}" in
+-*-aix*)
+- SHARED_LIB_FLAG=-qmkshrobj
+- ;;
+-*-darwin*)
+- SHARED_LIB_FLAG=-dynamiclib
+- ;;
+-*)
+- SHARED_LIB_FLAG=-shared
+- ;;
+-esac
++AS_CASE(["${host_cpu}-${host_os}"],
++ [*-aix*], [SHARED_LIB_FLAG=-qmkshrobj],
++ [*-darwin*], [SHARED_LIB_FLAG=-dynamiclib],
++ [SHARED_LIB_FLAG=-shared]
++)
+ AC_SUBST(SHARED_LIB_FLAG)
+
+ AC_ARG_ENABLE([unittest],
+- AS_HELP_STRING([--disable-unittest], [disable unittest]),
++ [AS_HELP_STRING([--disable-unittest], [disable unittest])],
+ [enable_unittest=$enableval],
+ [enable_unittest=enable_unittest])
+
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index e09bb6e710d4..07f7369d5a46 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig
app-arch/zip"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0-autoconf-2.70.patch"
+)
+
src_prepare() {
default