net/freeswitch/patches/470-esl-python.patch

   1 --- a/libs/esl/Makefile.am
   2 +++ b/libs/esl/Makefile.am
   3 @@ -82,7 +82,7 @@ pymod: $(MYLIB)
   4         $(MAKE) PYTHON=$(PYTHON) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python
   5
   6  py3mod: $(MYLIB)
   7 -       $(MAKE) PYTHON3=$(PYTHON3) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python3
   8 +       $(MAKE) PYTHON3=$(PYTHON3) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" PYTHON3_CFLAGS="$(PYTHON3_CFLAGS)" PYTHON3_LDFLAGS="$(PYTHON3_LDFLAGS)" -C python3
   9
  10  tclmod: $(MYLIB)
  11         $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C tcl
  12 @@ -106,7 +106,7 @@ pymod-install: pymod
  13         $(MAKE) PYTHON=$(PYTHON) -C python install
  14
  15  py3mod-install: py3mod
  16 -       $(MAKE) PYTHON3=$(PYTHON3) -C python3 install
  17 +       $(MAKE) PYTHON3=$(PYTHON3) PYTHON3_SITE_DIR="$(PYTHON3_SITE_DIR)" -C python3 install
  18
  19  rubymod-install: rubymod
  20         $(MAKE) -C ruby install
  21 --- a/libs/esl/python3/Makefile
  22 +++ b/libs/esl/python3/Makefile
  23 @@ -1,6 +1,4 @@
  24 -LOCAL_CFLAGS=`$(PYTHON3) ./python-config --includes`
  25 -LOCAL_LDFLAGS=`$(PYTHON3) ./python-config --ldflags`
  26 -SITE_DIR=$(DESTDIR)/`$(PYTHON3) -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))"`
  27 +SITE_DIR=$(DESTDIR)/$(PYTHON3_SITE_DIR)
  28
  29  all: _ESL.so
  30
  31 @@ -8,10 +6,10 @@ esl_wrap.cpp:
  32         swig3.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
  33
  34  esl_wrap.o: esl_wrap.cpp
  35 -       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
  36 +       $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(PYTHON3_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
  37
  38  _ESL.so: esl_wrap.o
  39 -       $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o _ESL.so -L. $(LIBS)
  40 +       $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(PYTHON3_LDFLAGS) -o _ESL.so -L. $(LIBS)
  41
  42  install: _ESL.so
  43         mkdir -p $(SITE_DIR)