jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

squid: needs host-libcap for cf_gen

Browse Source 
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-11-29 21:14:35 +01:00
parent 273c2accca
commit b32c8f23e5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/squid/squid-cross-compile.patch
View File

@ -19,13 +19,21 @@ diff -Nura squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
dnl Select digest auth scheme helpers to build dnl Select digest auth scheme helpers to build
if test -n "$AUTH_MODULE_digest"; then if test -n "$AUTH_MODULE_digest"; then
@@ -2115,6 +2115,10 @@ @@ -2115,6 +2115,18 @@
;; ;;
esac esac
+dnl Define CXX_FOR_BUILD +dnl Define CXX_FOR_BUILD
+CXX_FOR_BUILD="$CXX_FOR_BUILD" +CXX_FOR_BUILD="$CXX_FOR_BUILD"
+AC_SUBST(CXX_FOR_BUILD) +AC_SUBST(CXX_FOR_BUILD)
+
+dnl Define CXXFLAGS_FOR_BUILD
+CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD"
+AC_SUBST(CXXFLAGS_FOR_BUILD)
+
+dnl Define LDFLAGS_FOR_BUILD
+LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD"
+AC_SUBST(LDFLAGS_FOR_BUILD)
+ +
dnl Check for programs dnl Check for programs
AC_PROG_CPP AC_PROG_CPP
@ -47,7 +55,7 @@ diff -Nura squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am
true true
+cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES) +cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES)
+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \ + $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
+ $(top_srcdir)/lib/util.c \ + $(top_srcdir)/lib/util.c \
+ $(top_srcdir)/compat/assert.cc \ + $(top_srcdir)/compat/assert.cc \
+ $(cf_gen_LDADD) $(LIBS) ${INCLUDES} + $(cf_gen_LDADD) $(LIBS) ${INCLUDES}

2
package/squid/squid.mk
View File

@ -6,7 +6,7 @@
SQUID_VERSION = 3.1.9 SQUID_VERSION = 3.1.9
SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
SQUID_DEPENDENCIES = libcap SQUID_DEPENDENCIES = libcap host-libcap
SQUID_AUTORECONF = YES SQUID_AUTORECONF = YES
SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \ SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \ ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \