"-export-dynamic" -> "$(EXPORT_SYMBOLS_LDFLAGS)" to build on Solaris.

4 files changed, 28 insertions, 9 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index ec7c70b2aad..e442a71c5ad 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/02 09:12:28 skrll Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/17 03:34:03 markd Exp $
 
 DISTNAME=	kdeutils-3.0.5a
 COMMENT=	Utilities for the KDE integrated X11 desktop
@@ -9,6 +9,8 @@ USE_BUILDLINK2=		YES
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
+MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index d75f480f767..9642cb546d4 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/01/02 09:12:29 skrll Exp $
+$NetBSD: distinfo,v 1.8 2003/01/17 03:34:03 markd Exp $
 
 SHA1 (kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd
 Size (kdeutils-3.0.5a.tar.bz2) = 1515962 bytes
@@ -11,8 +11,8 @@ SHA1 (patch-af) = 4091778400aded8120d59707eeeeaa4e8864cd34
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ah) = fe2b3a94957a2d9cf6a294cbd3a77d100af84164
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
-SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef
-SHA1 (patch-ak) = c45e16590bcc44b08d58f28ef5144545fbdceabc
+SHA1 (patch-aj) = 31d0fe7b4d4b785da9e4e8188feb4378a25ce05a
+SHA1 (patch-ak) = 19816b75a7dad23fc52ba5c856f549d66c45d8ee
 SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe
diff --git a/misc/kdeutils3/patches/patch-aj b/misc/kdeutils3/patches/patch-aj
index ce7351b48ca..d3b4b2d1d90 100644
--- a/misc/kdeutils3/patches/patch-aj
+++ b/misc/kdeutils3/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2003/01/17 03:34:04 markd Exp $
 
---- klaptopdaemon/Makefile.am.orig	Tue Feb 26 20:54:52 2002
+--- klaptopdaemon/Makefile.am.orig	Fri Mar  8 14:19:15 2002
 +++ klaptopdaemon/Makefile.am
 @@ -1,15 +1,19 @@
 -lib_LTLIBRARIES = klaptopdaemon.la
@@ -27,7 +27,15 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp  main.cpp  pcmcia.cpp  power.cpp  warning.cpp portable.cpp
  
-@@ -25,6 +29,3 @@
+@@ -18,13 +22,10 @@
+ 
+ INCLUDES= $(all_includes)
+ 
+-LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
++LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
+ 
+ kcm_laptop_la_METASOURCES = AUTO
+ 
  messages:
  	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
  	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index cc41ec9cbc7..f6676c99251 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $
+$NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
 
---- klaptopdaemon/Makefile.in.orig	Mon Dec 30 16:24:30 2002
+--- klaptopdaemon/Makefile.in.orig	Tue Dec 17 23:55:05 2002
 +++ klaptopdaemon/Makefile.in
 @@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@
  x_includes = @x_includes@
@@ -30,6 +30,15 @@ $NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp  main.cpp  pcmcia.cpp  power.cpp  warning.cpp portable.cpp
  
+@@ -246,7 +250,7 @@
+ 
+ INCLUDES = $(all_includes)
+ 
+-LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
++LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
+ 
+ #>- kcm_laptop_la_METASOURCES = AUTO
+ subdir = klaptopdaemon
 @@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
  	warning.lo portable.lo
  @KDE_USE_FINAL_FALSE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS)