summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortv <tv>1998-10-02 14:40:13 +0000
committertv <tv>1998-10-02 14:40:13 +0000
commitb20e16330f31ab79468743dac37b0e36eee56928 (patch)
treeb86046a8378b3ca37b131ddd6caee473a5d9bb64 /www
parentc52396bf78cf4319d47f624aa805ca03e83d929c (diff)
downloadpkgsrc-b20e16330f31ab79468743dac37b0e36eee56928.tar.gz
Make this work properly on ELF. Use -Wl,--export-dynamic, and no leading
symbol underscore, on ELF systems.
Diffstat (limited to 'www')
-rw-r--r--www/apache/Makefile6
-rw-r--r--www/apache/patches/patch-ac14
2 files changed, 19 insertions, 1 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index af060897dcd..61480aa3102 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1998/09/17 18:18:54 cjs Exp $
+# $NetBSD: Makefile,v 1.20 1998/10/02 14:40:13 tv Exp $
#
DISTNAME= apache_1.3.1
@@ -42,3 +42,7 @@ post-install:
.if !defined(NOPIC)
CONFIGURE_ARGS+=--enable-module=so --enable-shared=include
.endif
+
+.if (${SHLIB_TYPE} == "ELF")
+CONFIGURE_ENV+= LDFLAGS_SHLIB_EXPORT=-Wl,--export-dynamic
+.endif
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
new file mode 100644
index 00000000000..fa06308e0f1
--- /dev/null
+++ b/www/apache/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 1998/10/02 14:40:13 tv Exp $
+
+--- src/os/unix/os.h.orig Fri Oct 2 10:14:27 1998
++++ src/os/unix/os.h Fri Oct 2 10:14:54 1998
+@@ -114,7 +114,8 @@
+ #define RTLD_GLOBAL 0
+ #endif
+
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || \
++ (defined(__NetBSD__) && !defined(__ELF__))
+ #define DLSYM_NEEDS_UNDERSCORE
+ #endif
+