You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2001/12/03 19:00:05 UTC
cvs commit: httpd-2.0/build binbuild.sh
gregames 01/12/03 10:00:05
Modified: . CHANGES configure.in
. configure.in APRVARS.in
support apachectl.in
build binbuild.sh
Log:
get binbuild working when apr, apr-util, and expat are built shared in
directories that are not well known to the loader.
How it works:
* libtool figures out the name of this system's library path environment
variable (i.e. LD_LIBRARY_PATH, LIBPATH, DYLD_LIBRARY_PATH) at apr
configure time (existing code)
* save this variable name in SHLIBPATH_VAR in APRVARS
* substitute this name when apachectl is created
* uncomment the lines containing this variable during binbuild
* install_bindist.sh updates the path to lib/ when the binary is
installed (existing code)
not done yet, but a good idea:
* create a file or directory containing all environment variable settings
for apachectl. Others env vars need to be tweaked, at least on AIX and
OS/390, so keeping them separate should reduce headaches long term.
Revision Changes Path
1.465 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- CHANGES 2001/12/01 17:42:17 1.464
+++ CHANGES 2001/12/03 18:00:03 1.465
@@ -1,4 +1,7 @@
Changes with Apache 2.0.30-dev
+
+ *) Get binary builds working when libapr and libaprutil are built
+ shared [Greg Ames]
*) Get shared builds of libapr and libaprutil, as well as Apache DSOs,
working on AIX. [Aaron Bannert, Dick Dunbar <RL...@pacbell.net>,
1.188 +1 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- configure.in 2001/12/01 17:42:18 1.187
+++ configure.in 2001/12/03 18:00:04 1.188
@@ -261,6 +261,7 @@
APACHE_SUBST(OS)
APACHE_SUBST(OS_DIR)
APACHE_SUBST(BUILTIN_LIBS)
+APACHE_SUBST(SHLIBPATH_VAR)
PRE_SHARED_CMDS='echo ""'
POST_SHARED_CMDS='echo ""'
1.381 +1 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- configure.in 2001/11/29 02:45:59 1.380
+++ configure.in 2001/12/03 18:00:04 1.381
@@ -1364,6 +1364,7 @@
AC_SUBST(DEFAULT_OSDIR)
AC_SUBST(EXEEXT)
AC_SUBST(LIBTOOL_LIBS)
+AC_SUBST(shlibpath_var)
echo "${nl}Construct Makefiles and header files."
MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"
1.11 +1 -0 apr/APRVARS.in
Index: APRVARS.in
===================================================================
RCS file: /home/cvs/apr/APRVARS.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- APRVARS.in 2001/08/01 20:37:03 1.10
+++ APRVARS.in 2001/12/03 18:00:04 1.11
@@ -7,6 +7,7 @@
EXTRA_LIBS="@EXTRA_LIBS@"
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
LIBTOOL_LIBS="@LIBTOOL_LIBS@"
+SHLIBPATH_VAR="@shlibpath_var@"
APR_SOURCE_DIR="@abs_srcdir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
1.8 +5 -0 httpd-2.0/support/apachectl.in
Index: apachectl.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apachectl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apachectl.in 2001/11/07 19:19:05 1.7
+++ apachectl.in 2001/12/03 18:00:04 1.8
@@ -30,6 +30,11 @@
# the path to your httpd binary, including options if necessary
HTTPD='@prefix@/bin/@progname@'
#
+# the following lines are automatically uncommented for
+# binary builds
+#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@'
+#binbuild export @SHLIBPATH_VAR@
+#
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
1.30 +1 -0 httpd-2.0/build/binbuild.sh
Index: binbuild.sh
===================================================================
RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- binbuild.sh 2001/11/29 14:18:06 1.29
+++ binbuild.sh 2001/12/03 18:00:04 1.30
@@ -137,6 +137,7 @@
cp bindist/conf/httpd.conf bindist/conf/httpd-std.conf
sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
+ -e "s%^#binbuild %%" \
bindist/bin/apachectl > bindist/bin/apachectl.tmp
mv bindist/bin/apachectl.tmp bindist/bin/apachectl