From 1073ef32e7863b5a35420fa2a40551aa7cdbc5a4 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Mon, 26 Aug 2002 00:16:57 +0000
Subject: The Solaris linker doesn't understand --export-dynamic, so give this
 a chance of working by only passing -Wl,--export-dynamic if we are not on
 SunOS.

---
 www/php4/Makefile        | 10 ++++++----
 www/php4/Makefile.module |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'www/php4')

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 940c1371380..b72f50110c6 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:25 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/08/26 00:16:57 grant Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 PKGREVISION=		# empty
@@ -11,9 +11,6 @@ USE_BUILDLINK2=		YES
 
 .include "Makefile.php"
 
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		-Wl,--export-dynamic
-
 CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php
 
@@ -29,6 +26,11 @@ LINK_LIBGCC_LDFLAGS=	-Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive
 MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 .endif
 
+# Ensure we export symbols in the linked shared object.
+.if ${OPSYS} != "SunOS"
+LDFLAGS+=		-Wl,--export-dynamic
+.endif
+
 CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
 
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 5abebe016c0..6b10d18ab5b 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.16 2002/08/25 18:40:25 jlam Exp $
+# $NetBSD: Makefile.module,v 1.17 2002/08/26 00:16:57 grant Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -33,7 +33,9 @@ USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 # Ensure we export symbols in the linked shared objects.
+.if ${OPSYS} != "SunOS"
 LDFLAGS+=		-Wl,--export-dynamic
+.endif
 
 PLIST_SRC=		${.CURDIR}/../../www/php4/PLIST.module
 MESSAGE_SRC=		${.CURDIR}/../../www/php4/MESSAGE.module
-- 
cgit v1.2.3