diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2002-03-17 04:52:15 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2002-03-17 04:52:15 +0000 |
| commit | 5aac3e97de231a6fc6106b5908460d788eade7ad (patch) | |
| tree | 634299bc7c8f2dea66ddd166f0cbbd7a5e9bc19b | |
| parent | 76a0b2b81f310ce5879fbe7e37f7961dcc54aa67 (diff) | |
This along with the recent dynamic linker fixes allows modules to work
with Apache on our ELF-based architecures. Enable alpha, powerpc and sparc64.
| -rw-r--r-- | usr.sbin/httpd/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/Configure | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index ad9b878f772..99e764bc60c 100644 --- a/usr.sbin/httpd/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ # Build wrapper for Apache -# $OpenBSD: Makefile.bsd-wrapper,v 1.25 2002/02/15 22:49:15 beck Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.26 2002/03/17 04:52:14 brad Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -97,7 +97,9 @@ INSTALL_MODULES= # If you support dynamic loading, enable the so module, and build all the # modules that come with Apache. -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc" +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \ +${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \ +${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" CONFIG_ARGS+= ${DSO_MODULE_ARGS} INSTALL_MODULES= \ src/modules/experimental/mod_mmap_static.so \ diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure index a372c264f6c..ed5b3338b41 100644 --- a/usr.sbin/httpd/src/Configure +++ b/usr.sbin/httpd/src/Configure @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: Configure,v 1.16 2002/02/21 23:33:14 miod Exp $ +# $OpenBSD: Configure,v 1.17 2002/03/17 04:52:14 brad Exp $ ## ==================================================================== ## The Apache Software License, Version 1.1 ## @@ -1132,6 +1132,9 @@ if [ "x$using_shlib" = "x1" ] ; then *) LD_SHLIB="gcc" LDFLAGS_SHLIB="-shared \$(CFLAGS_SHLIB)" + if test -z "`echo __ELF__ | ${CC} -E - | grep __ELF__`"; then + LDFLAGS_SHLIB_EXPORT="-Wl,-E" + fi ;; esac LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB |