rse 98/09/17 07:43:27
Modified: src CHANGES Configure Makefile.tmpl
. Makefile.tmpl
src/main http_main.c
Log:
Fix SHARED_CORE feature for HPUX platform: We now use extension `.sl'
instead of `.so' and `SHLIB_PATH' instead of `LD_LIBRARY_PATH' on this
platform to make the braindead HPUX linker happy. Notice, for the module
DSOs we don't have to use this, because these are loaded manually (and
not via HPUX' dld).
PR: 2905, 2968
Revision Changes Path
1.1066 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -r1.1065 -r1.1066
--- CHANGES 1998/09/17 12:15:30 1.1065
+++ CHANGES 1998/09/17 14:43:18 1.1066
@@ -1,5 +1,11 @@
Changes with Apache 1.3.2
+ *) Fix SHARED_CORE feature for HPUX platform: We now use extension `.sl'
+ instead of `.so' and `SHLIB_PATH' instead of `LD_LIBRARY_PATH' on this
+ platform to make the braindead HPUX linker happy. Notice, for the module
+ DSOs we don't have to use this, because these are loaded manually (and
+ not via HPUX' dld). [Ralf S. Engelschall] PR#2905, PR#2968
+
*) Remove 64 thread limit on Win32.
[Bill Stoddard <[EMAIL PROTECTED]>]
1.291 +6 -1 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- Configure 1998/09/17 04:09:39 1.290
+++ Configure 1998/09/17 14:43:20 1.291
@@ -256,6 +256,7 @@
SHELL="/bin/sh"
TARGET="httpd"
SUBTARGET="target_static"
+SHLIB_SUFFIX_NAME=""
SHLIB_SUFFIX_LIST=""
CAT="cat"
@@ -873,6 +874,7 @@
LD_SHLIB="ld"
DEF_SHARED_CORE=no
DEF_SHARED_CHAIN=no
+ SHLIB_SUFFIX_NAME=so
SHLIB_SUFFIX_DEPTH=all
SHLIB_EXPORT_FILES=no
case "$PLAT" in
@@ -1049,6 +1051,7 @@
esac
LDFLAGS_SHLIB="-b"
LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred"
+ SHLIB_SUFFIX_NAME=sl
;;
*-hp-hpux10.*|*-hp-hpux11.*)
case $CC in
@@ -1056,7 +1059,8 @@
*/cc|cc ) CFLAGS_SHLIB="+z" ;;
esac
LDFLAGS_SHLIB="-b"
- LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred"
+ LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred -Wl,+s"
+ SHLIB_SUFFIX_NAME=sl
;;
*-ibm-aix*)
case $CC in
@@ -1667,6 +1671,7 @@
echo "TARGET=$TARGET" >> Makefile
echo "SUBDIRS=$SUBDIRS" >> Makefile
echo "SUBTARGET=$SUBTARGET" >> Makefile
+echo "SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME" >> Makefile
echo "SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST" >> Makefile
echo "" >> Makefile
1.106 +6 -6 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- Makefile.tmpl 1998/09/07 06:59:31 1.105
+++ Makefile.tmpl 1998/09/17 14:43:21 1.106
@@ -34,20 +34,20 @@
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c
-libhttpd.ep: libhttpd.so
+libhttpd.ep: libhttpd.$(SHLIB_SUFFIX_NAME)
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o libhttpd.ep -DSHARED_CORE_TIESTATIC main/http_main.c \
-L. -lhttpd $(LIBS)
-libhttpd.so: subdirs modules.o
+libhttpd.$(SHLIB_SUFFIX_NAME): subdirs modules.o
$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
- $(LD_SHLIB) $(LDFLAGS_SHLIB) -o libhttpd.so buildmark.o $(OBJS)
$(REGLIB)
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o libhttpd.$(SHLIB_SUFFIX_NAME)
buildmark.o $(OBJS) $(REGLIB)
@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
- rm -f libhttpd.so.*; \
+ rm -f libhttpd.$(SHLIB_SUFFIX_NAME).*; \
for suffix in $(SHLIB_SUFFIX_LIST) ""; do \
[ ".$$suffix" = . ] && continue; \
- echo "ln libhttpd.so libhttpd.so.$$suffix"; \
- ln libhttpd.so libhttpd.so.$$suffix; \
+ echo "ln libhttpd.$(SHLIB_SUFFIX_NAME)
libhttpd.$(SHLIB_SUFFIX_NAME).$$suffix"; \
+ ln libhttpd.$(SHLIB_SUFFIX_NAME)
libhttpd.$(SHLIB_SUFFIX_NAME).$$suffix; \
done; \
fi
1.47 +8 -7 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.tmpl 1998/09/17 08:59:08 1.46
+++ Makefile.tmpl 1998/09/17 14:43:24 1.47
@@ -238,18 +238,19 @@
@echo "===> [programs: Installing Apache httpd program and shared
objects]"
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/httpd $(root)$(sbindir)/httpd
[EMAIL PROTECTED] [ ".`grep 'SUBTARGET=target_shared'
$(TOP)/$(SRC)/Makefile`" != . ]; then \
+ SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
+ SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep"; \
$(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep; \
- echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.so
$(root)$(libexecdir)/libhttpd.so"; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.so
$(root)$(libexecdir)/libhttpd.so; \
- SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`"; \
+ echo "$(INSTALL_SCRIPT)
$(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}"; \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}; \
if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
- echo "$(RM) $(libexecdir)/libhttpd.so.*"; \
- $(RM) $(libexecdir)/libhttpd.so.*; \
+ echo "$(RM)
$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*"; \
+ $(RM) $(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*; \
for suffix in $${SHLIB_SUFFIX_LIST} ""; do \
[ ".$${suffix}" = . ] && continue; \
- echo "$(LN) $(root)$(libexecdir)/libhttpd.so
$(root)$(libexecdir)/libhttpd.so.$${suffix}"; \
- $(LN) $(root)$(libexecdir)/libhttpd.so
$(root)$(libexecdir)/libhttpd.so.$${suffix}; \
+ echo "$(LN)
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.$${suffix}"; \
+ $(LN)
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.$${suffix}; \
done; \
fi; \
fi
1.393 +4 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- http_main.c 1998/09/15 19:47:41 1.392
+++ http_main.c 1998/09/17 14:43:25 1.393
@@ -5789,7 +5789,11 @@
#include "ap_config.h"
#include "httpd.h"
+#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
+#define VARNAME "SHLIB_PATH"
+#else
#define VARNAME "LD_LIBRARY_PATH"
+#endif
#ifndef SHARED_CORE_DIR
#define SHARED_CORE_DIR HTTPD_ROOT "/libexec"
