* [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation
@ 2020-12-07 0:47 4ricci
2020-12-07 0:56 ` [PR PATCH] [Updated] hitch: update to 1.5.2 4ricci
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: 4ricci @ 2020-12-07 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
There is a new pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages hitch-1.5.2
https://github.com/void-linux/void-packages/pull/27012
hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation
Not the latest version, but the latest we can build with this version of libressl.
A patch file from https://github.com/void-linux/void-packages/pull/27012.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-1.5.2-27012.patch --]
[-- Type: text/x-diff, Size: 6868 bytes --]
From 7e933dd53330ace16bbc0ede67ec904dedf6039f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 7 Dec 2020 01:32:04 +0100
Subject: [PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for
cross-compilation
---
srcpkgs/hitch/patches/configure.patch | 131 -----------------------
srcpkgs/hitch/patches/cross-compile.diff | 11 ++
srcpkgs/hitch/template | 9 +-
3 files changed, 18 insertions(+), 133 deletions(-)
delete mode 100644 srcpkgs/hitch/patches/configure.patch
create mode 100644 srcpkgs/hitch/patches/cross-compile.diff
diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch
deleted file mode 100644
index eba616119d1..00000000000
--- a/srcpkgs/hitch/patches/configure.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- configure-master 2020-04-30 18:55:31.884880427 +0200
-+++ configure 2020-04-30 19:58:12.271990731 +0200
-@@ -6798,12 +6798,6 @@
- $as_echo_n "checking whether the compiler accepts -g... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -g $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6817,7 +6811,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6826,12 +6819,6 @@
- $as_echo_n "checking whether the compiler accepts -O2... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -O2 $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6845,7 +6832,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6862,12 +6848,6 @@
- $as_echo_n "checking whether the compiler accepts -Wall... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Wall $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6881,7 +6861,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6890,12 +6869,6 @@
- $as_echo_n "checking whether the compiler accepts -W... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -W $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6909,7 +6882,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6918,12 +6890,6 @@
- $as_echo_n "checking whether the compiler accepts -Werror... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Werror $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6937,7 +6903,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6956,12 +6921,6 @@
- $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$EV_CFLAGS -fno-strict-aliasing $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6975,9 +6934,8 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
-- CFLAGS=$hitch_save_CFLAGS
-+ CFLAGS="$hitch_save_CFLAGS -fno-strict-aliasing"
-
-
-
diff --git a/srcpkgs/hitch/patches/cross-compile.diff b/srcpkgs/hitch/patches/cross-compile.diff
new file mode 100644
index 00000000000..d64624e6b72
--- /dev/null
+++ b/srcpkgs/hitch/patches/cross-compile.diff
@@ -0,0 +1,11 @@
+--- hitch.m4
++++ hitch.m4
+@@ -24,7 +24,7 @@
+ AC_MSG_CHECKING([whether the compiler accepts $2])
+ hitch_save_CFLAGS=$CFLAGS
+ CFLAGS="[$]$1 $2 $CFLAGS"
+- AC_RUN_IFELSE(
++ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([int main(void) { return (0); }])],
+ [AC_MSG_RESULT([yes]); $1="[$]$1 $2"],
+ [AC_MSG_RESULT([no])])
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index f99169099c0..1b5fd3ef796 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,12 @@
# Template file for 'hitch'
pkgname=hitch
version=1.5.2
-revision=2
+revision=1
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
makedepends="libev-devel libressl-devel"
+checkdepends="lsof curl grep"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
license="BSD-2-Clause"
@@ -16,6 +17,10 @@ system_accounts="_hitch"
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vman hitch.8
vman hitch.conf.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] hitch: update to 1.5.2
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
@ 2020-12-07 0:56 ` 4ricci
2020-12-07 0:59 ` [PR PATCH] [Updated] hitch: add checkdepends; simpler patch for cross-compilation 4ricci
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: 4ricci @ 2020-12-07 0:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages hitch-1.5.2
https://github.com/void-linux/void-packages/pull/27012
hitch: update to 1.5.2
Not the latest version, but the latest we can build with this version of libressl.
A patch file from https://github.com/void-linux/void-packages/pull/27012.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-1.5.2-27012.patch --]
[-- Type: text/x-diff, Size: 6848 bytes --]
From 775c005a5c832918a314550a4cff3f61289de6c6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 7 Dec 2020 01:32:04 +0100
Subject: [PATCH] hitch: add checkdepends; simpler patch for cross-compilation
---
srcpkgs/hitch/patches/configure.patch | 131 -----------------------
srcpkgs/hitch/patches/cross-compile.diff | 11 ++
srcpkgs/hitch/template | 9 +-
3 files changed, 18 insertions(+), 133 deletions(-)
delete mode 100644 srcpkgs/hitch/patches/configure.patch
create mode 100644 srcpkgs/hitch/patches/cross-compile.diff
diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch
deleted file mode 100644
index eba616119d1..00000000000
--- a/srcpkgs/hitch/patches/configure.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- configure-master 2020-04-30 18:55:31.884880427 +0200
-+++ configure 2020-04-30 19:58:12.271990731 +0200
-@@ -6798,12 +6798,6 @@
- $as_echo_n "checking whether the compiler accepts -g... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -g $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6817,7 +6811,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6826,12 +6819,6 @@
- $as_echo_n "checking whether the compiler accepts -O2... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -O2 $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6845,7 +6832,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6862,12 +6848,6 @@
- $as_echo_n "checking whether the compiler accepts -Wall... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Wall $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6881,7 +6861,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6890,12 +6869,6 @@
- $as_echo_n "checking whether the compiler accepts -W... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -W $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6909,7 +6882,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6918,12 +6890,6 @@
- $as_echo_n "checking whether the compiler accepts -Werror... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Werror $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6937,7 +6903,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6956,12 +6921,6 @@
- $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$EV_CFLAGS -fno-strict-aliasing $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6975,9 +6934,8 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
-- CFLAGS=$hitch_save_CFLAGS
-+ CFLAGS="$hitch_save_CFLAGS -fno-strict-aliasing"
-
-
-
diff --git a/srcpkgs/hitch/patches/cross-compile.diff b/srcpkgs/hitch/patches/cross-compile.diff
new file mode 100644
index 00000000000..d64624e6b72
--- /dev/null
+++ b/srcpkgs/hitch/patches/cross-compile.diff
@@ -0,0 +1,11 @@
+--- hitch.m4
++++ hitch.m4
+@@ -24,7 +24,7 @@
+ AC_MSG_CHECKING([whether the compiler accepts $2])
+ hitch_save_CFLAGS=$CFLAGS
+ CFLAGS="[$]$1 $2 $CFLAGS"
+- AC_RUN_IFELSE(
++ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([int main(void) { return (0); }])],
+ [AC_MSG_RESULT([yes]); $1="[$]$1 $2"],
+ [AC_MSG_RESULT([no])])
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index f99169099c0..1b5fd3ef796 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,12 @@
# Template file for 'hitch'
pkgname=hitch
version=1.5.2
-revision=2
+revision=1
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
makedepends="libev-devel libressl-devel"
+checkdepends="lsof curl grep"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
license="BSD-2-Clause"
@@ -16,6 +17,10 @@ system_accounts="_hitch"
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vman hitch.8
vman hitch.conf.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] hitch: add checkdepends; simpler patch for cross-compilation
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
2020-12-07 0:56 ` [PR PATCH] [Updated] hitch: update to 1.5.2 4ricci
@ 2020-12-07 0:59 ` 4ricci
2020-12-07 1:00 ` 4ricci
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: 4ricci @ 2020-12-07 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages hitch-1.5.2
https://github.com/void-linux/void-packages/pull/27012
hitch: add checkdepends; simpler patch for cross-compilation
A patch file from https://github.com/void-linux/void-packages/pull/27012.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-1.5.2-27012.patch --]
[-- Type: text/x-diff, Size: 6848 bytes --]
From cd042a92cf3b20a648044f2b2eaf960e17b8643e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 7 Dec 2020 01:32:04 +0100
Subject: [PATCH] hitch: add checkdepends; simpler patch for cross-compilation
---
srcpkgs/hitch/patches/configure.patch | 131 -----------------------
srcpkgs/hitch/patches/cross-compile.diff | 11 ++
srcpkgs/hitch/template | 9 +-
3 files changed, 18 insertions(+), 133 deletions(-)
delete mode 100644 srcpkgs/hitch/patches/configure.patch
create mode 100644 srcpkgs/hitch/patches/cross-compile.diff
diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch
deleted file mode 100644
index eba616119d1..00000000000
--- a/srcpkgs/hitch/patches/configure.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- configure-master 2020-04-30 18:55:31.884880427 +0200
-+++ configure 2020-04-30 19:58:12.271990731 +0200
-@@ -6798,12 +6798,6 @@
- $as_echo_n "checking whether the compiler accepts -g... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -g $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6817,7 +6811,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6826,12 +6819,6 @@
- $as_echo_n "checking whether the compiler accepts -O2... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -O2 $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6845,7 +6832,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6862,12 +6848,6 @@
- $as_echo_n "checking whether the compiler accepts -Wall... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Wall $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6881,7 +6861,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6890,12 +6869,6 @@
- $as_echo_n "checking whether the compiler accepts -W... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -W $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6909,7 +6882,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6918,12 +6890,6 @@
- $as_echo_n "checking whether the compiler accepts -Werror... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Werror $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6937,7 +6903,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6956,12 +6921,6 @@
- $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$EV_CFLAGS -fno-strict-aliasing $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6975,9 +6934,8 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
-- CFLAGS=$hitch_save_CFLAGS
-+ CFLAGS="$hitch_save_CFLAGS -fno-strict-aliasing"
-
-
-
diff --git a/srcpkgs/hitch/patches/cross-compile.diff b/srcpkgs/hitch/patches/cross-compile.diff
new file mode 100644
index 00000000000..d64624e6b72
--- /dev/null
+++ b/srcpkgs/hitch/patches/cross-compile.diff
@@ -0,0 +1,11 @@
+--- hitch.m4
++++ hitch.m4
+@@ -24,7 +24,7 @@
+ AC_MSG_CHECKING([whether the compiler accepts $2])
+ hitch_save_CFLAGS=$CFLAGS
+ CFLAGS="[$]$1 $2 $CFLAGS"
+- AC_RUN_IFELSE(
++ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([int main(void) { return (0); }])],
+ [AC_MSG_RESULT([yes]); $1="[$]$1 $2"],
+ [AC_MSG_RESULT([no])])
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index f99169099c0..1b5fd3ef796 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,12 @@
# Template file for 'hitch'
pkgname=hitch
version=1.5.2
-revision=2
+revision=1
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
makedepends="libev-devel libressl-devel"
+checkdepends="lsof curl grep"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
license="BSD-2-Clause"
@@ -16,6 +17,10 @@ system_accounts="_hitch"
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vman hitch.8
vman hitch.conf.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] hitch: add checkdepends; simpler patch for cross-compilation
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
2020-12-07 0:56 ` [PR PATCH] [Updated] hitch: update to 1.5.2 4ricci
2020-12-07 0:59 ` [PR PATCH] [Updated] hitch: add checkdepends; simpler patch for cross-compilation 4ricci
@ 2020-12-07 1:00 ` 4ricci
2020-12-09 15:11 ` ericonr
2020-12-09 15:12 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: 4ricci @ 2020-12-07 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages hitch-1.5.2
https://github.com/void-linux/void-packages/pull/27012
hitch: add checkdepends; simpler patch for cross-compilation
A patch file from https://github.com/void-linux/void-packages/pull/27012.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-1.5.2-27012.patch --]
[-- Type: text/x-diff, Size: 6789 bytes --]
From 6af3293d27186959873bbc40a0a2e5b011df3804 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 7 Dec 2020 01:32:04 +0100
Subject: [PATCH] hitch: add checkdepends; simpler patch for cross-compilation
---
srcpkgs/hitch/patches/configure.patch | 131 -----------------------
srcpkgs/hitch/patches/cross-compile.diff | 11 ++
srcpkgs/hitch/template | 7 +-
3 files changed, 17 insertions(+), 132 deletions(-)
delete mode 100644 srcpkgs/hitch/patches/configure.patch
create mode 100644 srcpkgs/hitch/patches/cross-compile.diff
diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch
deleted file mode 100644
index eba616119d1..00000000000
--- a/srcpkgs/hitch/patches/configure.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- configure-master 2020-04-30 18:55:31.884880427 +0200
-+++ configure 2020-04-30 19:58:12.271990731 +0200
-@@ -6798,12 +6798,6 @@
- $as_echo_n "checking whether the compiler accepts -g... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -g $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6817,7 +6811,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6826,12 +6819,6 @@
- $as_echo_n "checking whether the compiler accepts -O2... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -O2 $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6845,7 +6832,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6862,12 +6848,6 @@
- $as_echo_n "checking whether the compiler accepts -Wall... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Wall $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6881,7 +6861,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6890,12 +6869,6 @@
- $as_echo_n "checking whether the compiler accepts -W... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -W $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6909,7 +6882,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6918,12 +6890,6 @@
- $as_echo_n "checking whether the compiler accepts -Werror... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$HITCH_CFLAGS -Werror $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6937,7 +6903,6 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
- CFLAGS=$hitch_save_CFLAGS
-
-@@ -6956,12 +6921,6 @@
- $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; }
- hitch_save_CFLAGS=$CFLAGS
- CFLAGS="$EV_CFLAGS -fno-strict-aliasing $CFLAGS"
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int main(void) { return (0); }
-@@ -6975,9 +6934,8 @@
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-
-- CFLAGS=$hitch_save_CFLAGS
-+ CFLAGS="$hitch_save_CFLAGS -fno-strict-aliasing"
-
-
-
diff --git a/srcpkgs/hitch/patches/cross-compile.diff b/srcpkgs/hitch/patches/cross-compile.diff
new file mode 100644
index 00000000000..d64624e6b72
--- /dev/null
+++ b/srcpkgs/hitch/patches/cross-compile.diff
@@ -0,0 +1,11 @@
+--- hitch.m4
++++ hitch.m4
+@@ -24,7 +24,7 @@
+ AC_MSG_CHECKING([whether the compiler accepts $2])
+ hitch_save_CFLAGS=$CFLAGS
+ CFLAGS="[$]$1 $2 $CFLAGS"
+- AC_RUN_IFELSE(
++ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([int main(void) { return (0); }])],
+ [AC_MSG_RESULT([yes]); $1="[$]$1 $2"],
+ [AC_MSG_RESULT([no])])
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index f99169099c0..b34b15e16b4 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -4,8 +4,9 @@ version=1.5.2
revision=2
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config automake"
makedepends="libev-devel libressl-devel"
+checkdepends="lsof curl grep"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
license="BSD-2-Clause"
@@ -16,6 +17,10 @@ system_accounts="_hitch"
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vman hitch.8
vman hitch.conf.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: hitch: add checkdepends; simpler patch for cross-compilation
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
` (2 preceding siblings ...)
2020-12-07 1:00 ` 4ricci
@ 2020-12-09 15:11 ` ericonr
2020-12-09 15:12 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-09 15:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27012#issuecomment-741834374
Comment:
Nice! Thanks :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: hitch: add checkdepends; simpler patch for cross-compilation
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
` (3 preceding siblings ...)
2020-12-09 15:11 ` ericonr
@ 2020-12-09 15:12 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-09 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
There's a merged pull request on the void-packages repository
hitch: add checkdepends; simpler patch for cross-compilation
https://github.com/void-linux/void-packages/pull/27012
Description:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-09 15:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-07 0:47 [PR PATCH] hitch: update to 1.5.2 - Add checkdepends - Simpler patch for cross-compilation 4ricci
2020-12-07 0:56 ` [PR PATCH] [Updated] hitch: update to 1.5.2 4ricci
2020-12-07 0:59 ` [PR PATCH] [Updated] hitch: add checkdepends; simpler patch for cross-compilation 4ricci
2020-12-07 1:00 ` 4ricci
2020-12-09 15:11 ` ericonr
2020-12-09 15:12 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).