diff options
| author | tron <tron@pkgsrc.org> | 1999-05-04 20:31:32 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-05-04 20:31:32 +0000 |
| commit | 55fe4683224876c687a9cc139a4047ec606e7b1b (patch) | |
| tree | 0087ec511301e23ef38bc83e621a9dde64b34892 /x11 | |
| parent | 42734982ac1e255523970cb1ba2d0fa3b70d0d76 (diff) | |
| download | pkgsrc-55fe4683224876c687a9cc139a4047ec606e7b1b.tar.gz | |
Because the "c++rt0.o" kludge doesn't work on 1.3/1.3.x systems we only
use it on 1.4 a.out systems. Under 1.3/1.3.x a.out systems we use a static
"libgnome" again, ELF systems always build a shared library.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-libs/Makefile | 17 | ||||
| -rw-r--r-- | x11/gnome-libs/patches/patch-ad | 22 | ||||
| -rw-r--r-- | x11/gnome-libs/pkg/PLIST | 3 |
3 files changed, 33 insertions, 9 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index cc4d60b4d8b..54bf4be6b1d 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/05/02 15:51:27 tron Exp $ +# $NetBSD: Makefile,v 1.23 1999/05/04 20:31:32 tron Exp $ # DISTNAME= gnome-libs-1.0.9 @@ -20,7 +20,6 @@ GNU_CONFIGURE= yes USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -LIBTOOL_FLAGS= --cplusplus LDFLAGS+= "-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --with-glib-prefix=${LOCALBASE} @@ -33,11 +32,6 @@ LOCALSTATEDIR= /var/gnome PLIST_SRC= ${WRKDIR}/PLIST -# Someone should show the GNOME people how to use CVS and how to define -# dependences in makefiles. -post-extract: - @find ${WRKDIR} -name "*.idl" -type f | xargs ${TOUCH} - pre-build: (cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h) @@ -45,5 +39,14 @@ post-install: ${MKDIR} ${LOCALSTATEDIR} ${SED} -e 's#@@LOCALSTATEDIR@@#${LOCALSTATEDIR}#' \ <${PKGDIR}/PLIST >${PLIST_SRC} + @cd ${PREFIX}; find lib -name 'libgnome.so.*' >>${PLIST_SRC} .include "../../mk/bsd.pkg.mk" + +.if (${OBJECT_FMT} == a.out) +.if exists(/usr/bin/c89) +MAKE_ENV+= A_OUT_LIBTOOL_FLAGS=--cplusplus +.else +MAKE_ENV+= A_OUT_STATIC=-static +.endif +.endif diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad new file mode 100644 index 00000000000..55477933675 --- /dev/null +++ b/x11/gnome-libs/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.6 1999/05/04 20:31:32 tron Exp $ + +--- libgnome/Makefile.in.orig Wed Apr 28 02:57:58 1999 ++++ libgnome/Makefile.in Tue May 4 19:26:57 1999 +@@ -74,7 +74,7 @@ + AWK = @AWK@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ +-CC = @CC@ ++CC = @CC@ ${A_OUT_STATIC} + DATADIRNAME = @DATADIRNAME@ + DLLTOOL = @DLLTOOL@ + DL_LIB = @DL_LIB@ +@@ -118,7 +118,7 @@ + LIBGTKXMHTML_LIBS = @LIBGTKXMHTML_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBSUPPORT = @LIBSUPPORT@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ ${A_OUT_LIBTOOL_FLAGS} + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST index 85f9b86f790..113e1c366fb 100644 --- a/x11/gnome-libs/pkg/PLIST +++ b/x11/gnome-libs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 1999/05/02 15:51:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.14 1999/05/04 20:31:33 tron Exp $ bin/dns-helper bin/gconfigger bin/gnome-bug @@ -167,7 +167,6 @@ lib/libart_lgpl.a lib/libart_lgpl.so.2.0 lib/libartConf.sh lib/libgnome.a -lib/libgnome.so.35.3 lib/libgnomesupport.a lib/libgnomesupport.so.0.0 lib/libgnomeui.a |