freeswitch: fix 230-mod_radius_cdr.patch
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>
This commit is contained in:
parent
fd0c65d379
commit
3fafe1afac
1 changed files with 3 additions and 3 deletions
|
@ -5,7 +5,7 @@
|
||||||
$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
|
$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
|
||||||
mkdir -p $(RADCLIENT_BUILDDIR)
|
mkdir -p $(RADCLIENT_BUILDDIR)
|
||||||
- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
|
- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
|
||||||
+ cd $(RADCLIENT_BUILDDIR) && patch -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff && autoreconf -v -f -i -s && $(DEFAULT_VARS) CFLAGS="${CFLAGS} -Wno-cpp" $(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)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
|
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
|
||||||
|
|
Loading…
Reference in a new issue