OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Oct-2003 12:49:00
Branch: HEAD Handle: 2003100711485801
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
add optional debugging support
Summary:
Revision Changes Path
1.172 +31 -1 openpkg-src/apache/apache.spec
1.6898 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.171 -r1.172 apache.spec
--- openpkg-src/apache/apache.spec 2 Oct 2003 18:32:32 -0000 1.171
+++ openpkg-src/apache/apache.spec 7 Oct 2003 10:48:59 -0000 1.172
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20031002
+Release: 20031007
# package options (suexec related)
%option with_suexec yes
@@ -133,6 +133,9 @@
%option with_shared_core no
%option with_shared_chain no
+# package options (debugging)
+%option with_debug no
+
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
@@ -427,7 +430,11 @@
%if "%{with_mod_php}" == "yes" || "%{with_mod_php3}" == "yes" || "%{with_mod_dav}"
== "yes"
( cd apache_%{V_apache}
CC="%{l_cc}" \
+%if "%{with_debug}" == "yes"
+ CFLAGS="%{l_cflags} -g" \
+%else
CFLAGS="%{l_cflags -O}" \
+%endif
./configure \
%if "%{with_mod_ssl}" == "yes"
--enable-rule=EAPI \
@@ -486,9 +493,15 @@
%if "%{with_mod_php}" == "yes"
( cd php-%{V_mod_php}
CC="%{l_cc}"; export CC
+%if "%{with_debug}" == "yes"
CFLAGS="%{l_cflags -O} %{l_cppflags}"; export CFLAGS
CPPFLAGS="%{l_cflags -O} %{l_cppflags}"; export CPPFLAGS
LDFLAGS="%{l_cflags -O} %{l_ldflags}"; export LDFLAGS
+%else
+ CFLAGS="%{l_cflags} -g %{l_cppflags}"; export CFLAGS
+ CPPFLAGS="%{l_cflags} -g %{l_cppflags}"; export CPPFLAGS
+ LDFLAGS="%{l_cflags} -g %{l_ldflags}"; export LDFLAGS
+%endif
LIBS=""; export LIBS
%if "%{with_mod_ssl}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
@@ -690,11 +703,19 @@
%if "%{with_mod_dav}" == "yes"
( cd mod_dav-%{V_mod_dav}
CC="%{l_cc}" \
+%if "%{with_debug}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
+ CFLAGS="%{l_cflags} -g" \
+%else
+ CFLAGS="%{l_cflags} -g -DEAPI" \
+%endif
+%else
%if "%{with_mod_ssl}" == "yes"
CFLAGS="%{l_cflags -O}" \
%else
CFLAGS="%{l_cflags -O} -DEAPI" \
%endif
+%endif
LDFLAGS="%{l_cflags -O}" \
./configure \
--with-apache=../apache_%{V_apache}
@@ -777,7 +798,11 @@
# configure Apache
( cd apache_%{V_apache}
+%if "%{with_debug}" == "yes"
+ cflags="%{l_cflags} -g"
+%else
cflags="%{l_cflags -O}"
+%endif
ldflags=""
libs=""
%if "%{with_mod_auth_pam}" == "yes"
@@ -819,6 +844,9 @@
--libexecdir=%{l_prefix}/lib/apache \
--datadir=%{l_prefix}/share/apache \
--localstatedir=%{l_prefix}/var/apache \
+%if "%{with_debug}" == "yes"
+ --without-execstrip \
+%endif
%if "%{with_suexec}" == "yes"
--enable-suexec \
--suexec-caller=%{with_suexec_caller} \
@@ -944,8 +972,10 @@
%{SOURCE rc.apache} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# strip installation binaries
+%if "%{with_debug}" != "yes"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
+%endif
# determine installation tree files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6897 -r1.6898 news.txt
--- openpkg-web/news.txt 7 Oct 2003 09:51:54 -0000 1.6897
+++ openpkg-web/news.txt 7 Oct 2003 10:48:58 -0000 1.6898
@@ -1,3 +1,4 @@
+07-Oct-2003: Upgraded package: P<apache-1.3.28-20031007>
07-Oct-2003: Upgraded package: P<tar-1.13.25-20031007>
07-Oct-2003: Upgraded package: P<gzip-1.3.5-20031007>
07-Oct-2003: Upgraded package: P<vim-6.2.106-20031007>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
