rse 98/10/22 04:54:59
Modified: src CHANGES Configure
src/os/unix os.h
Log:
PORT: DSO/ELF support for FreeBSD 3.0.
Submitted by: Ralf S. Engelschall, Dirk Froemberg <[EMAIL PROTECTED]>
Revision Changes Path
1.1115 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1114
retrieving revision 1.1115
diff -u -r1.1114 -r1.1115
--- CHANGES 1998/10/21 05:57:55 1.1114
+++ CHANGES 1998/10/22 11:54:56 1.1115
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) PORT: DSO/ELF support for FreeBSD 3.0.
+ [Ralf S. Engelschall, Dirk Froemberg <[EMAIL PROTECTED]>]
+
*) Add a "default-handler" handler that calls the default_hander()
function which is normally called for static content. This allows
you to override a specific handler. [Marc Slemko]
1.301 +13 -1 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- Configure 1998/10/19 23:58:26 1.300
+++ Configure 1998/10/22 11:54:57 1.301
@@ -901,11 +901,23 @@
LDFLAGS_SHLIB_EXPORT="-rdynamic"
SHLIB_SUFFIX_DEPTH=0
;;
- *-freebsd*)
+ *-freebsd2*)
CFLAGS_SHLIB="-fpic"
LDFLAGS_SHLIB="-Bshareable"
LDFLAGS_SHLIB_EXPORT=""
SHLIB_SUFFIX_DEPTH=2
+ ;;
+ *-freebsd3*)
+ CFLAGS_SHLIB="-fpic"
+ LDFLAGS_SHLIB="-Bshareable"
+ OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat ||
echo aout`
+ if [ ".$OBJFORMAT" = .elf ]; then
+ LDFLAGS_SHLIB_EXPORT="-Wl,-E"
+ SHLIB_SUFFIX_DEPTH=0
+ else
+ LDFLAGS_SHLIB_EXPORT=""
+ SHLIB_SUFFIX_DEPTH=2
+ fi
;;
*-openbsd*)
CFLAGS_SHLIB="-fPIC"
1.33 +2 -1 apache-1.3/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- os.h 1998/09/16 06:49:44 1.32
+++ os.h 1998/10/22 11:54:58 1.33
@@ -121,7 +121,8 @@
#define RTLD_GLOBAL 0
#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if (defined(__FreeBSD__) && !defined(__ELF__)) || \
+ defined(__OpenBSD__) || defined(__NetBSD__)
#define DLSYM_NEEDS_UNDERSCORE
#endif
