From 7388f7020567ca4e6ba09817e61cd01b8e7a0714 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 4 Jan 2021 09:58:26 -0600
Subject: [PATCH] eb: Add proper cross-build patch

---
 srcpkgs/eb/patches/0001-cross.patch | 111 ++++++++++++++++++
 srcpkgs/eb/patches/cross.patch      | 171 ----------------------------
 srcpkgs/eb/template                 |   8 +-
 3 files changed, 117 insertions(+), 173 deletions(-)
 create mode 100644 srcpkgs/eb/patches/0001-cross.patch
 delete mode 100644 srcpkgs/eb/patches/cross.patch

diff --git a/srcpkgs/eb/patches/0001-cross.patch b/srcpkgs/eb/patches/0001-cross.patch
new file mode 100644
index 00000000000..a804560bcd9
--- /dev/null
+++ b/srcpkgs/eb/patches/0001-cross.patch
@@ -0,0 +1,111 @@
+From 46b9fd687125d963b8e3b675f272c5348bdb28dd Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Mon, 4 Jan 2021 09:53:39 -0600
+Subject: [PATCH] cross
+
+---
+ m4/largefile.m4    |  4 ++--
+ m4/sockinttypes.m4 | 16 ++++++++--------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git m4/largefile.m4 m4/largefile.m4
+index 7d98cae..f033367 100644
+--- m4/largefile.m4
++++ m4/largefile.m4
+@@ -32,7 +32,7 @@ dnl *
+ AC_DEFUN([eb_SYS_LARGEFILE], [dnl
+ AC_REQUIRE([AC_SYS_LARGEFILE])
+ AC_CACHE_CHECK([for ll modifier of printf], ac_cv_func_printf_ll,
+-[AC_RUN_IFELSE([
++[AC_COMPILE_IFELSE([
+     #include <stdio.h>
+     #include <string.h>
+     #include <limits.h>
+@@ -43,7 +43,7 @@ AC_CACHE_CHECK([for ll modifier of printf], ac_cv_func_printf_ll,
+     }
+ ], [ac_cv_func_printf_ll=yes], [ac_cv_func_printf_ll=no])])
+ AC_CACHE_CHECK([for I64 modifier of printf], ac_cv_func_printf_i64,
+-[AC_RUN_IFELSE([
++[AC_COMPILE_IFELSE([
+     #include <stdio.h>
+     #include <string.h>
+     #include <limits.h>
+diff --git m4/sockinttypes.m4 m4/sockinttypes.m4
+index a003df4..85f6e7d 100644
+--- m4/sockinttypes.m4
++++ m4/sockinttypes.m4
+@@ -54,7 +54,7 @@ in_port_t in_port;
+ ], [ac_cv_type_in_port_t=yes], [ac_cv_type_in_port_t=no])])
+ if test "$ac_cv_type_in_port_t" != yes; then
+     ac_cv_sin_port_size=unknown
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     #include <netinet/in.h>
+@@ -63,7 +63,7 @@ if test "$ac_cv_type_in_port_t" != yes; then
+ 	return (sizeof(addr.sin_port) == sizeof(long)) ? 0 : 1;
+     }
+     ], [ac_cv_sin_port_size=long])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     #include <netinet/in.h>
+@@ -72,7 +72,7 @@ if test "$ac_cv_type_in_port_t" != yes; then
+ 	return (sizeof(addr.sin_port) == sizeof(int)) ? 0 : 1;
+     }
+     ], [ac_cv_sin_port_size=int])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     #include <netinet/in.h>
+@@ -81,7 +81,7 @@ if test "$ac_cv_type_in_port_t" != yes; then
+ 	return (sizeof(addr.sin_port) == sizeof(short)) ? 0 : 1;
+     }
+     ], [ac_cv_sin_port_size=short])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     #include <netinet/in.h>
+@@ -112,7 +112,7 @@ sa_family_t sa_family;
+ ], [ac_cv_type_sa_family_t=yes], [ac_cv_type_sa_family_t=no])])
+ if test "$ac_cv_type_sa_family_t" != yes; then
+     ac_cv_sa_family_size=unknown
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     int main() {
+@@ -120,7 +120,7 @@ if test "$ac_cv_type_sa_family_t" != yes; then
+ 	return (sizeof(addr.sa_family) == sizeof(long)) ? 0 : 1;
+     }
+     ], [ac_cv_sa_family_size=long])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     int main() {
+@@ -128,7 +128,7 @@ if test "$ac_cv_type_sa_family_t" != yes; then
+ 	return (sizeof(addr.sa_family) == sizeof(int)) ? 0 : 1;
+     }
+     ], [ac_cv_sa_family_size=int])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     int main() {
+@@ -136,7 +136,7 @@ if test "$ac_cv_type_sa_family_t" != yes; then
+ 	return (sizeof(addr.sa_family) == sizeof(short)) ? 0 : 1;
+     }
+     ], [ac_cv_sa_family_size=short])
+-    AC_RUN_IFELSE([
++    AC_COMPILE_IFELSE([
+     #include <sys/types.h>
+     #include <sys/socket.h>
+     int main() {
+-- 
+2.30.0
+
diff --git a/srcpkgs/eb/patches/cross.patch b/srcpkgs/eb/patches/cross.patch
deleted file mode 100644
index 9c9f0e7a319..00000000000
--- a/srcpkgs/eb/patches/cross.patch
+++ /dev/null
@@ -1,171 +0,0 @@
---- configure.old	2017-07-01 12:43:00.384785855 +0200
-+++ configure	2017-07-01 12:55:03.102813398 +0200
-@@ -6752,7 +6752,7 @@
- 
- if test $ac_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -11607,14 +11607,7 @@
- if test "${ac_cv_func_printf_ll+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+  if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -11672,14 +11665,7 @@
- if test "${ac_cv_func_printf_i64+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+  if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14066,14 +14052,7 @@
- $as_echo "$ac_cv_type_in_port_t" >&6; }
- if test "$ac_cv_type_in_port_t" != yes; then
-     ac_cv_sin_port_size=unknown
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14120,14 +14099,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14174,14 +14146,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14228,14 +14193,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14337,14 +14295,7 @@
- $as_echo "$ac_cv_type_sa_family_t" >&6; }
- if test "$ac_cv_type_sa_family_t" != yes; then
-     ac_cv_sa_family_size=unknown
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14390,14 +14341,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14443,14 +14387,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -14496,14 +14433,7 @@
- fi
- 
- 
--    if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+    if test "$cross_compiling" = yes; then :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
diff --git a/srcpkgs/eb/template b/srcpkgs/eb/template
index c372b71c9fc..4a2bbe483f4 100644
--- a/srcpkgs/eb/template
+++ b/srcpkgs/eb/template
@@ -3,15 +3,19 @@ pkgname=eb
 version=4.4.3
 revision=2
 build_style=gnu-configure
-hostmakedepends="perl"
+hostmakedepends="automake libtool perl"
 makedepends="zlib-devel"
 short_desc="C library and tools for accessing CD-ROM books"
 maintainer="John <me@johnnynator.dev>"
-license="BSD-3"
+license="BSD-3-Clause"
 homepage="https://github.com/2ion/eb"
 distfiles="https://github.com/2ion/eb/archive/${version}.tar.gz"
 checksum=16274f4d5ec34cc37ed308927390a1d0d09e0e6a2b35fbff7d17aacca0524a37
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vlicense COPYING
 }