From 33e72c684bb1d77dcf6cac7a53d76de4dcdc02c4 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 19 May 2004 15:16:39 +0000 Subject: use g++ to build shared libs to get an implicite dependency on libstdc++ --- x11/wxGTK/distinfo | 4 ++-- x11/wxGTK/patches/patch-ab | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 1b0cf4d6c53..664fbbb748e 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2004/04/27 21:59:24 dmcmahill Exp $ +$NetBSD: distinfo,v 1.14 2004/05/19 15:16:39 drochner Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29 -SHA1 (patch-ab) = 5327ac3b45e7bc1957a8482bd4d10652fe28c1a1 +SHA1 (patch-ab) = 55f61ebaa77aeea5bfe447b974a1f18e87917300 SHA1 (patch-ac) = 01aa0bea28f838680cce6326fa67700b12f75d86 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab index f8ef236135b..7fe5b3a32ce 100644 --- a/x11/wxGTK/patches/patch-ab +++ b/x11/wxGTK/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.10 2004/01/10 14:23:52 recht Exp $ +$NetBSD: patch-ab,v 1.11 2004/05/19 15:16:39 drochner Exp $ --- Makefile.in.orig 2003-09-21 13:31:27.000000000 +0200 +++ Makefile.in 2004-01-10 10:30:56.000000000 +0100 @@ -209,7 +209,7 @@ $NetBSD: patch-ab,v 1.10 2004/01/10 14:23:52 recht Exp $ - $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) +$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS) + @$(INSTALL_DATA_DIR) $(build_libdir) -+ ${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1 ++ ${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1 # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line # but this seems to result in problems with libwx_gtk being linked in twice @@ -218,7 +218,7 @@ $NetBSD: patch-ab,v 1.10 2004/01/10 14:23:52 recht Exp $ - $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS) +$(build_libdir)/lib@WX_LIBRARY_GL@.la: glcanvas.o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la + @$(INSTALL_DATA_DIR) $(build_libdir) -+ ${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_GL@.la glcanvas.lo ${EXTRALIBS} $(LDFLAGS_GL) $(OPENGLLIBS) -rpath ${PREFIX}/lib -version-info 0:1 ++ ${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_GL@.la glcanvas.lo ${EXTRALIBS} $(LDFLAGS_GL) $(OPENGLLIBS) -rpath ${PREFIX}/lib -version-info 0:1 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) - @$(INSTALL) -d $(build_libdir) -- cgit v1.2.3