diff options
| author | jlam <jlam@pkgsrc.org> | 1999-09-23 05:29:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 1999-09-23 05:29:24 +0000 |
| commit | 6eb32b42542a1b9e054adc8b54c7c702c3f4aff8 (patch) | |
| tree | e4c517cfe723a3345d3b3f7cc9716444c0b91d80 /x11/xforms/Makefile | |
| parent | 5a82d05f4e199a396cb4e85926af4d899c56f840 (diff) | |
| download | pkgsrc-6eb32b42542a1b9e054adc8b54c7c702c3f4aff8.tar.gz | |
On ELF platforms, linking against the shared library doesn't work, but
linking against the static library does (see PR#8417), so for now, disable
the installation of the shared library on ELF platforms until a better fix
is found. But at least, those of us needing xforms on i386-ELF can get
some work done!
Diffstat (limited to 'x11/xforms/Makefile')
| -rw-r--r-- | x11/xforms/Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index bbe9f4b7504..45bb58e321c 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/09/23 03:42:29 jlam Exp $ +# $NetBSD: Makefile,v 1.19 1999/09/23 05:29:24 jlam Exp $ # DISTNAME= bxform-088 @@ -25,11 +25,11 @@ ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-ns32k *-*-sparc .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" -.if ${MACHINE_ARCH} == "i386" +.if ${OPSYS} == "NetBSD" +.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF" DISTNAME= bxform-088-ELF .endif -.if ${MACHINE_ARCH} == "sparc" +.if ${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} == "ELF" # XXX no ELF objects for sparc on NetBSD IGNORE="is not available for ${MACHINE_PLATFORM} using the ELF object format." .endif @@ -40,16 +40,22 @@ DIST_SUBDIR= xforms-${MACHINE_ARCH} ## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific. OBJMACHINE= yes +USE_X11BASE= yes NO_BUILD= yes -USE_X11BASE= yes +PLIST_SRC= ${PKGDIR}/PLIST.mi ${PKGSRC}/PLIST.shlib post-patch: ${MV} ${WRKSRC}/mkconfig.h ${WRKSRC}/mkconfig.h.orig ${CP} ${FILESDIR}/mkconfig.h ${WRKSRC} +# XXX ELF linker tries to resolve libGL.so symbols when linking with +# XXX shared libxforms, so for now, disable installation of shared lib. +.if ${OBJECT_FMT} == "ELF" +PLIST_SRC= ${PKGDIR}/PLIST.mi + post-install: - ${LN} -fs libforms.a ${PREFIX}/lib/libxforms.a - ${LN} -fs libforms.so.0.88 ${PREFIX}/lib/libxforms.so.0.88 + ${RM} ${PREFIX}/lib/libforms.so.0.88 ${PREFIX}/lib/libxforms.so.0.88 +.endif .include "../../mk/bsd.pkg.mk" |