* [Buildroot] [PATCH] package/libpthsem: correctly handle --{en, dis}able-debug arguments on configure
2015-03-19 21:02 [Buildroot] [PATCH] package/haveged: add systemd units Steven Noonan
@ 2015-03-19 21:02 ` Steven Noonan
2015-06-05 14:29 ` Thomas Petazzoni
2015-03-20 13:06 ` [Buildroot] [PATCH] package/haveged: add systemd units Mike Williams
2015-03-20 13:11 ` Thomas Petazzoni
2 siblings, 1 reply; 5+ messages in thread
From: Steven Noonan @ 2015-03-19 21:02 UTC (permalink / raw)
To: buildroot
The pthsem package was incorrectly handling --{en,dis}able-debug. If either of
the two were provided, it always assumed that meant that debugging should be
enabled, which resulted in *extremely* noisy debug logging (e.g. this can be
observed by generating a GPG keypair).
This patch makes pthsem handle the argument correctly.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
.../0002-fix-configure-disable-debug.patch | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 package/libpthsem/0002-fix-configure-disable-debug.patch
diff --git a/package/libpthsem/0002-fix-configure-disable-debug.patch b/package/libpthsem/0002-fix-configure-disable-debug.patch
new file mode 100644
index 0000000..512291e
--- /dev/null
+++ b/package/libpthsem/0002-fix-configure-disable-debug.patch
@@ -0,0 +1,54 @@
+The existing pthsem configure script incorrectly handles the enable-debug and
+disable-debug arguments. The inside of the AC_ARG_ENABLE conditional indicates
+whether or not the value was explicitly defined by the user, not that it was
+enabled. The value of "$enableval" should be checked in order for it to work.
+
+Source: https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Package-Options.html
+
+Signed-off-by: Steven Noonan <steven@uplinklabs.net>
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 03b42de..a5b3f98 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -344,7 +344,21 @@ AC_DEFUN(AC_CHECK_DEBUGGING,[dnl
+ AC_ARG_ENABLE(debug,dnl
+ [ --enable-debug build for debugging (default=no)],
+ [dnl
+-if test ".$ac_cv_prog_gcc" = ".yes"; then
++case "${enableval}" in
++yes)
++ msg="enabled" ;;
++no)
++ msg="disabled" ;;
++esac
++],[
++msg="disabled"
++])dnl
++AC_MSG_CHECKING(for compilation debug mode)
++AC_MSG_RESULT([$msg])
++if test ".$msg" = .enabled; then
++ AC_DEFINE(PTH_DEBUG, 1, [define to enable Pth debugging])
++ enable_shared=no
++ if test ".$ac_cv_prog_gcc" = ".yes"; then
+ case $PLATFORM in
+ *-*-freebsd*|*-*-solaris* ) CFLAGS="$CFLAGS -pedantic" ;;
+ esac
+@@ -354,16 +368,7 @@ if test ".$ac_cv_prog_gcc" = ".yes"; then
+ AC_COMPILER_OPTION(wmore, -W<xxx>, $WMORE, CFLAGS="$CFLAGS $WMORE")
+ AC_COMPILER_OPTION(wnolonglong, -Wno-long-long, -Wno-long-long, CFLAGS="$CFLAGS -Wno-long-long")
+ AC_COMPILER_OPTION(fnostrictaliasing, -fno-strict-aliasing, -fno-strict-aliasing, CFLAGS="$CFLAGS -fno-strict-aliasing")
+-fi
+-msg="enabled"
+-AC_DEFINE(PTH_DEBUG, 1, [define to enable Pth debugging])
+-],[
+-msg="disabled"
+-])dnl
+-AC_MSG_CHECKING(for compilation debug mode)
+-AC_MSG_RESULT([$msg])
+-if test ".$msg" = .enabled; then
+- enable_shared=no
++ fi
+ fi
+ ])
+
--
2.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH] package/haveged: add systemd units
2015-03-19 21:02 [Buildroot] [PATCH] package/haveged: add systemd units Steven Noonan
2015-03-19 21:02 ` [Buildroot] [PATCH] package/libpthsem: correctly handle --{en, dis}able-debug arguments on configure Steven Noonan
@ 2015-03-20 13:06 ` Mike Williams
2015-03-20 13:11 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Mike Williams @ 2015-03-20 13:06 UTC (permalink / raw)
To: buildroot
Reviewed-by: Mike Williams <mike@mikebwilliams.com>
On Thu, Mar 19, 2015 at 5:02 PM, Steven Noonan <steven@uplinklabs.net> wrote:
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>
> ---
> package/haveged/haveged.mk | 8 ++++++++
> package/haveged/haveged.service | 10 ++++++++++
> 2 files changed, 18 insertions(+)
> create mode 100644 package/haveged/haveged.service
>
> diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk
> index 88d85cd..c68f766 100644
> --- a/package/haveged/haveged.mk
> +++ b/package/haveged/haveged.mk
> @@ -14,4 +14,12 @@ define HAVEGED_INSTALL_INIT_SYSV
> $(TARGET_DIR)/etc/init.d/S21haveged
> endef
>
> +define HAVEGED_INSTALL_INIT_SYSTEMD
> + $(INSTALL) -D -m 644 package/haveged/haveged.service \
> + $(TARGET_DIR)/usr/lib/systemd/system/haveged.service
> + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> + ln -fs /usr/lib/systemd/system/haveged.service \
> + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/haveged.service
> +endef
> +
> $(eval $(autotools-package))
> diff --git a/package/haveged/haveged.service b/package/haveged/haveged.service
> new file mode 100644
> index 0000000..d87fe5b
> --- /dev/null
> +++ b/package/haveged/haveged.service
> @@ -0,0 +1,10 @@
> +[Unit]
> +Description=Entropy Harvesting Daemon
> +Documentation=man:haveged(8)
> +
> +[Service]
> +ExecStart=/usr/bin/haveged -F -w 1024 -v 1
> +SuccessExitStatus=143
> +
> +[Install]
> +WantedBy=multi-user.target
> --
> 2.3.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread