Группа :: Система/Серверы
Пакет: apache2
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: httpd-2.0.55-alt-build.patch
diff -dur httpd-2.0.55.old/build/rules.mk.in httpd-2.0.55/build/rules.mk.in
--- httpd-2.0.55.old/build/rules.mk.in 2005-02-04 23:21:18 +0300
+++ httpd-2.0.55/build/rules.mk.in 2006-04-01 05:30:45 +0400
@@ -23,11 +23,13 @@
# Note that includes are listed after the flags because -I options have
# left-to-right precedence and CPPFLAGS may include user-defined overrides.
#
-ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
+# Hack +
+ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS) $(ADD_CFLAGS)
+# Hack -
ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
ALL_CXXFLAGS = $(EXTRA_CXXFLAGS) $(NOTEST_CXXFLAGS) $(CXXFLAGS)
ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
-ALL_LIBS = $(EXTRA_LIBS) $(NOTEST_LIBS) $(LIBS)
+ALL_LIBS = $(EXTRA_LIBS) $(AP_LIBS) $(NOTEST_LIBS) $(LIBS)
ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
# Compile commands
diff -dur httpd-2.0.55.old/configure.in httpd-2.0.55/configure.in
--- httpd-2.0.55.old/configure.in 2005-09-13 00:41:34 +0400
+++ httpd-2.0.55/configure.in 2006-04-01 05:30:31 +0400
@@ -183,6 +183,7 @@
LTCFLAGS=""
;;
esac
+ SH_LIBS='$(ALL_LIBS)'
;;
esac
APACHE_SUBST(SHLTCFLAGS)
@@ -269,6 +270,8 @@
AC_MINIX
dnl ## Check for libraries
+AC_SEARCH_LIBS(sqrt, m)
+AC_CHECK_LIB(ldap, ldap_value_free)
dnl ## Check for header files
diff -dur httpd-2.0.55.old/srclib/pcre/Makefile.in httpd-2.0.55/srclib/pcre/Makefile.in
--- httpd-2.0.55.old/srclib/pcre/Makefile.in 2004-11-24 22:31:09 +0300
+++ httpd-2.0.55/srclib/pcre/Makefile.in 2006-04-01 05:30:45 +0400
@@ -4,6 +4,10 @@
CLEAN_TARGETS = dftables chartables.c
DISTCLEAN_TARGETS = pcre.h pcre-config config.h config.log config.status $(CLEAN_TARGETS)
+# Hack +
+ADD_CFLAGS="-fPIC"
+# Hack -
+
include $(top_srcdir)/build/ltlib.mk
config.h: