diff options
| author | asau <asau> | 2009-06-17 18:40:55 +0000 |
|---|---|---|
| committer | asau <asau> | 2009-06-17 18:40:55 +0000 |
| commit | ed99302b4fa2c44c15ddd08328a4811300e1f5d1 (patch) | |
| tree | 8f679d51d6b84066e7e269dbd086098713cb7086 | |
| parent | 5a73fccc03d8b11845d114bec67ec3a8e549bead (diff) | |
| download | pkgsrc-ed99302b4fa2c44c15ddd08328a4811300e1f5d1.tar.gz | |
Resolve conflicting edits: back out my change, expand comment.
| -rw-r--r-- | x11/gtk2/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index aa2ea8519c3..e08ee97e070 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.178 2009/06/17 17:57:55 asau Exp $ +# $NetBSD: Makefile,v 1.179 2009/06/17 18:40:55 asau Exp $ DISTNAME= gtk+-2.16.2 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -28,7 +28,7 @@ PTHREAD_AUTO_VARS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata -# papi support doesn't build +# Work around build problems, disable unstable PAPI, PR #41608: CONFIGURE_ARGS+= --disable-papi MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} TEST_TARGET= check @@ -63,11 +63,6 @@ PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .endif -# Work around build problems, disable unstable PAPI, PR #41608: -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-papi -.endif - .include "options.mk" # We remove the module databases during post-install since we create them |