mirror of
https://github.com/openwrt/telephony.git
synced 2025-05-02 15:41:08 +08:00
3fafe1afac
This is a patch in a patch. It may happen that the patch was already applied previously, so this amends the patch line to continue if the patch doesn't apply. It also sets the direction to forward-only. Also removes two trailing whitespace warnings. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am
|
|
+++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am
|
|
@@ -20,7 +20,7 @@ $(RADCLIENT_DIR):
|
|
|
|
$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
|
|
mkdir -p $(RADCLIENT_BUILDDIR)
|
|
- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
|
|
+ cd $(RADCLIENT_BUILDDIR) && patch -N -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff || echo "Assuming patch was applied previously" && autoreconf -v -f -i -s && $(DEFAULT_VARS) CFLAGS="${CFLAGS} -Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
|
|
$(TOUCH_TARGET)
|
|
|
|
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
|
|
--- /dev/null
|
|
+++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff
|
|
@@ -0,0 +1,21 @@
|
|
+--- a/configure.in
|
|
++++ b/configure.in
|
|
+@@ -234,13 +234,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([
|
|
+ enable_getrandom=getentropy],
|
|
+ [AC_MSG_RESULT(no)])
|
|
+
|
|
+-AC_MSG_CHECKING([for /dev/urandom])
|
|
+-if test -c /dev/urandom
|
|
+-then
|
|
+- AC_MSG_RESULT(yes)
|
|
+- AC_DEFINE(HAVE_DEV_URANDOM)
|
|
+-else
|
|
+- AC_MSG_RESULT(no)
|
|
++AC_CACHE_CHECK([/dev/urandom], [ac_cv_dev_urandom],
|
|
++ [ac_cv_dev_urandom=no
|
|
++ if test -c /dev/urandom; then ac_cv_dev_urandom=yes; fi])
|
|
++if test $ac_cv_dev_urandom = yes; then
|
|
++ AC_DEFINE(HAVE_DEV_URANDOM)
|
|
+ fi
|
|
+
|
|
+ AC_ARG_WITH([nettle], [AS_HELP_STRING([--with-nettle],
|