You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Sander Temme <sa...@temme.net> on 2005/04/11 00:11:46 UTC
[PATCH] Have buildconf support out-of-tree APR and APU
Folks,
I would like to keep my checkout layout like so:
httpd/
/trunk
apr/
/apr
/trunk
/apr-util
/trunk
So, I would like to call from the httpd checkout ./buildconf
--with-apr=../../apr/apr/trunk --with-apr-util=../../apr/apr-util/trunk
The following patch should fully propagate these parameters:
Index: buildconf
===================================================================
--- buildconf (revision 160800)
+++ buildconf (working copy)
@@ -127,23 +127,19 @@
cross_compile_warning="warning: AC_TRY_RUN called without default to
allow cross compiling"
-if [ -d srclib/apr ]; then
- echo rebuilding $apr_configure
- (cd srclib/apr && ./buildconf) || {
- echo "./buildconf failed for apr"
- exit 1
- }
- rm -f srclib/apr/apr.spec
-fi
+echo rebuilding $apr_configure
+(cd ${apr_src_dir} && ./buildconf) || {
+ echo "./buildconf failed for apr"
+ exit 1
+}
+rm -f ${apr_src_dir}/apr.spec
-if [ -d srclib/apr-util ]; then
- echo rebuilding $aprutil_configure
- (cd srclib/apr-util && ./buildconf) || {
- echo "./buildconf failed for apr-util"
- exit 1
- }
- rm -f srclib/apr-util/apr-util.spec
-fi
+echo rebuilding $aprutil_configure
+(cd ${apu_src_dir} && ./buildconf --with-apr=${apr_src_dir}) || {
+ echo "./buildconf failed for apr-util"
+ exit 1
+}
+rm -f ${apu_src_dir}/apr-util.spec
echo copying build files
cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \
This allows buildconf to complete as invoked above. I basically
propagate the ap{r,u}_src_dir variable through the script, and into
${apu_src_dir}/buildconf. I'm also removing the directory checks, since
they have been done before and the script has failed already if they
don't exist.
Next up: hack the httpd configure script (or its input) to learn from
buildconf about AP{R,U}. I'd like to post this first though to gather
input.
Thoughts?
S.
--
sander@temme.net http://www.temme.net/sander/
PGP FP: 51B4 8727 466A 0BC3 69F4 B7B8 B2BE BC40 1529 24AF
Re: [PATCH] Have buildconf support out-of-tree APR and APU
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
At 05:11 PM 4/10/2005, Sander Temme wrote:
>I would like to keep my checkout layout like so:
>
>httpd/
> /trunk
>apr/
> /apr
> /trunk
> /apr-util
> /trunk
>
>So, I would like to call from the httpd checkout ./buildconf --with-apr=../../apr/apr/trunk --with-apr-util=../../apr/apr-util/trunk
>
>Thoughts?
This brings to mind a recent kludgy commit. Really, to take this
to the logical extreme (and greatest flexibility) - I'd entertain
not only this patch, but a patch which created ./buildconf.nice
for remembering the locations of our dependencies.
Some commented before that it's overkill, but they hacked in their
preferred layout, and your post proves that there is no 'one true
right layout' that works for everyone.
My own schema?
builds/httpd-2.0
/srclib/{symlinks to...}
builds/apr-0.9/
builds/apr-util-0.9/
repeat for httpd-1.3 (no dependency on apr) and httpd-2.1 dependent
on apr-1.1 and apr-util-1.1
Bill