mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -61,6 +61,7 @@ PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
|
||
|
|
CFLAGS=-DSRCDIR=$(srcdir) @CFLAGS@
|
||
|
|
LDFLAGS=@LDFLAGS@
|
||
|
|
LIBS=@LIBS@
|
||
|
|
+PYTHON_LIBS=@PYTHON_LIBS@
|
||
|
|
LIBOBJS=@LIBOBJS@
|
||
|
|
# filter out ctime_r from compat obj.
|
||
|
|
LIBOBJ_WITHOUT_CTIME=@LIBOBJ_WITHOUT_CTIME@
|
||
|
|
@@ -474,7 +475,7 @@ libunbound/python/libunbound_wrap.c: $(srcdir)/libunbound/python/libunbound.i un
|
||
|
|
|
||
|
|
# Pyunbound python unbound wrapper
|
||
|
|
_unbound.la: libunbound_wrap.lo libunbound.la
|
||
|
|
- $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound
|
||
|
|
+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound $(LIBS) $(PYTHON_LIBS)
|
||
|
|
|
||
|
|
util/config_file.c: util/configparser.h
|
||
|
|
util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -699,11 +699,17 @@ if test x_$ub_test_python != x_no; then
|
||
|
|
AC_SUBST(PY_MAJOR_VERSION)
|
||
|
|
# Have Python
|
||
|
|
AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])
|
||
|
|
- if test -n "$LIBS"; then
|
||
|
|
- LIBS="$PYTHON_LDFLAGS $LIBS"
|
||
|
|
+ if test x_$ub_with_pythonmod != x_no; then
|
||
|
|
+ if test -n "$LIBS"; then
|
||
|
|
+ LIBS="$PYTHON_LDFLAGS $LIBS"
|
||
|
|
+ else
|
||
|
|
+ LIBS="$PYTHON_LDFLAGS"
|
||
|
|
+ fi
|
||
|
|
+ PYTHON_LIBS=""
|
||
|
|
else
|
||
|
|
- LIBS="$PYTHON_LDFLAGS"
|
||
|
|
+ PYTHON_LIBS="$PYTHON_LDFLAGS"
|
||
|
|
fi
|
||
|
|
+ AC_SUBST(PYTHON_LIBS)
|
||
|
|
if test -n "$CPPFLAGS"; then
|
||
|
|
CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
|
||
|
|
else
|