freeswitch-stable: update COPTS fixes
- Replace main COPTS fixes patch with the updated version sent upstream. - For the above to work we need to update DEFAULT_VARS in modmake.rules (new patch) - mod_pocketsphinx and mod_radius_cdr updated, no more extra COPTS fixes required there. - Now zeromq gets to use fortify headers and fails (warning about GCC extension turns into error), so make it drop '-pedantic'. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
eebb961147
commit
98232d46cb
5 changed files with 84 additions and 137 deletions
11
net/freeswitch-stable/patches/003-modmake-fix.diff
Normal file
11
net/freeswitch-stable/patches/003-modmake-fix.diff
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/build/modmake.rulesam
|
||||
+++ b/build/modmake.rulesam
|
||||
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-object
|
||||
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
|
||||
AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
|
||||
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
|
||||
-DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
|
||||
+DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
|
||||
DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic
|
||||
|
||||
moddir=@modulesdir@
|
|
@ -1,226 +1,157 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1941,7 +1941,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
|
||||
@@ -1941,7 +1941,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
|
||||
AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
|
||||
AC_SUBST(AM_MAKEFLAGS)
|
||||
|
||||
-ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
|
||||
+ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir}"
|
||||
+APR_ADDTO(CONFIGURE_CFLAGS, [$CFLAGS])
|
||||
+APR_ADDTO(CONFIGURE_CPPFLAGS, [$CPPFLAGS])
|
||||
+APR_ADDTO(CONFIGURE_CXXFLAGS, [$CXXFLAGS])
|
||||
+APR_ADDTO(CONFIGURE_LDFLAGS, [$LDFLAGS])
|
||||
+
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
|
||||
+ ;;
|
||||
+esac
|
||||
+ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CONFIGURE_CFLAGS' CONFIGURE_CPPFLAGS='$CONFIGURE_CPPFLAGS' CONFIGURE_CXXFLAGS='$CONFIGURE_CXXFLAGS' CONFIGURE_LDFLAGS='$CONFIGURE_LDFLAGS' "
|
||||
|
||||
# --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
|
||||
# --localstatedir='$localstatedir' --datadir='$datadir'"
|
||||
--- a/libs/apr-util/configure.ac
|
||||
+++ b/libs/apr-util/configure.ac
|
||||
@@ -20,9 +20,13 @@ dnl Generate ./config.nice for reproduci
|
||||
@@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci
|
||||
dnl
|
||||
APR_CONFIG_NICE(config.nice)
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
dnl # Some initial steps for configuration. We setup the default directory
|
||||
dnl # and which files are to be configured.
|
||||
--- a/libs/apr/configure.ac
|
||||
+++ b/libs/apr/configure.ac
|
||||
@@ -20,9 +20,13 @@ sinclude(build/apr_hints.m4)
|
||||
@@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4)
|
||||
sinclude(build/libtool.m4)
|
||||
sinclude(build/ltsugar.m4)
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
dnl Hard-coded inclusion at the tail end of apr_private.h:
|
||||
AH_BOTTOM([
|
||||
--- a/libs/broadvoice/configure.ac
|
||||
+++ b/libs/broadvoice/configure.ac
|
||||
@@ -22,9 +22,13 @@
|
||||
|
||||
AC_INIT([broadvoice],[0.1.0])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
m4_include(config/ax_compiler_vendor.m4)
|
||||
m4_include(config/ax_check_real_file.m4)
|
||||
--- a/libs/iksemel/configure.ac
|
||||
+++ b/libs/iksemel/configure.ac
|
||||
@@ -6,9 +6,13 @@ AC_CONFIG_SRCDIR([configure.ac])
|
||||
@@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_CONFIG_HEADERS(include/config.h)
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
+
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
--- a/libs/ilbc/configure.ac
|
||||
+++ b/libs/ilbc/configure.ac
|
||||
@@ -22,9 +22,13 @@
|
||||
|
||||
AC_INIT([ilbc], [0.0.1])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
AC_DEFUN([AX_COMPILER_VENDOR],
|
||||
[
|
||||
--- a/libs/libdingaling/configure.ac
|
||||
+++ b/libs/libdingaling/configure.ac
|
||||
@@ -8,9 +8,13 @@ AM_INIT_AUTOMAKE
|
||||
@@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE
|
||||
AC_CONFIG_SRCDIR([src])
|
||||
AC_CONFIG_HEADERS([src/config.h])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
+
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
#Set default language
|
||||
AC_LANG_C
|
||||
--- a/libs/libsndfile/configure.ac
|
||||
+++ b/libs/libsndfile/configure.ac
|
||||
@@ -15,9 +15,13 @@ AC_CANONICAL_TARGET([])
|
||||
AC_CONFIG_MACRO_DIR([M4])
|
||||
AC_CONFIG_HEADERS([src/config.h])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
|
||||
--- a/libs/sofia-sip/configure.ac
|
||||
+++ b/libs/sofia-sip/configure.ac
|
||||
@@ -13,9 +13,13 @@ dnl ---------------------------
|
||||
@@ -13,9 +13,12 @@ dnl ---------------------------
|
||||
dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
|
||||
AC_INIT([sofia-sip], [1.12.10devel])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
+
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
--- a/libs/spandsp/configure.ac
|
||||
+++ b/libs/spandsp/configure.ac
|
||||
@@ -21,9 +21,13 @@
|
||||
@@ -21,9 +21,12 @@
|
||||
AC_PREREQ([2.59])
|
||||
AC_INIT([spandsp], [1.99.0])
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
+
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
SPANDSP_LT_CURRENT=3
|
||||
SPANDSP_LT_REVISION=0
|
||||
--- a/libs/srtp/configure.ac
|
||||
+++ b/libs/srtp/configure.ac
|
||||
@@ -3,9 +3,13 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
|
||||
@@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
|
||||
AC_CONFIG_AUX_DIR(build)
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
+
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
#Set default language
|
||||
AC_LANG_C
|
||||
--- a/libs/tiff-4.0.2/configure.ac
|
||||
+++ b/libs/tiff-4.0.2/configure.ac
|
||||
@@ -32,9 +32,13 @@ AC_LANG(C)
|
||||
@@ -30,11 +30,13 @@ AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR(m4)
|
||||
AC_LANG(C)
|
||||
AC_PROG_LIBTOOL
|
||||
+m4_include(../apr/build/apr_common.m4)
|
||||
m4_include(m4/acinclude.m4)
|
||||
|
||||
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+case $host in
|
||||
+ *-darwin*)
|
||||
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
|
||||
+ ;;
|
||||
+esac
|
||||
+APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
|
||||
+APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
|
||||
+APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
|
||||
+APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
|
||||
|
||||
dnl Compute the canonical host (run-time) system type variable
|
||||
AC_CANONICAL_HOST
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
$(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR)
|
||||
mkdir -p $(SPHINXBASE_BUILDDIR)
|
||||
- (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
|
||||
+ (cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_STABLE_USE_FIXED_POINT))
|
||||
+ (cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_STABLE_USE_FIXED_POINT))
|
||||
$(TOUCH_TARGET)
|
||||
|
||||
$(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile
|
||||
|
@ -14,7 +14,7 @@
|
|||
$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
|
||||
mkdir -p $(POCKETSPHINX_BUILDDIR)
|
||||
- (cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=-Wno-return-type)
|
||||
+ (cd $(POCKETSPHINX_BUILDDIR) && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR))
|
||||
+ (cd $(POCKETSPHINX_BUILDDIR) && autoreconf -v -f -i -s && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR))
|
||||
$(TOUCH_TARGET)
|
||||
|
||||
$(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile
|
||||
|
|
|
@ -1,19 +1,14 @@
|
|||
--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am
|
||||
+++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am
|
||||
@@ -20,11 +20,11 @@ $(RADCLIENT_DIR):
|
||||
@@ -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 -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" CFLAGS+="-Wno-cpp" $(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+="-Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
|
||||
$(TOUCH_TARGET)
|
||||
|
||||
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
|
||||
- cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
|
||||
+ cd $(RADCLIENT_BUILDDIR) && $(MAKE)
|
||||
$(TOUCH_TARGET)
|
||||
|
||||
|
||||
--- /dev/null
|
||||
+++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff
|
||||
@@ -0,0 +1,32 @@
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
--- a/src/mod/event_handlers/mod_event_zmq/Makefile.am
|
||||
+++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am
|
||||
@@ -22,6 +22,7 @@ $(ZMQ_DIR):
|
||||
$(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz
|
||||
sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(ZMQ_DIR)/configure.in > $(ZMQ_DIR)/configure.in.tmp && \
|
||||
mv $(ZMQ_DIR)/configure.in.tmp $(ZMQ_DIR)/configure.in
|
||||
+ sed -i '/^libzmq_pedantic="yes"/s/yes/no/' $(ZMQ_DIR)/configure.in
|
||||
cd $(ZMQ_DIR) && ./autogen.sh
|
||||
|
||||
$(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR)
|
Loading…
Reference in a new issue