Correct bl3, NetBSD-current build confirmed (in TODO), add gnu iconv dep on non-NetBSD only

This commit is contained in:
Michal Pasternak 2004-03-17 13:55:08 +00:00 committed by Thomas Klausner
parent 392d8b5663
commit f2008819b9
3 changed files with 13 additions and 30 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/03/17 12:53:39 mpasternak Exp $
# $NetBSD: Makefile,v 1.8 2004/03/17 13:55:08 mpasternak Exp $
#
DISTNAME= glib-2.4.0
@ -23,7 +23,13 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gobject-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread-2.0.pc.in
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "NetBSD"
# FreeBSD needs this
CONFIGURE_ARGS+= --with-libiconv=gnu
.endif
CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
.include "../../devel/pkgconfig/buildlink3.mk"

View file

@ -1,14 +1,12 @@
$Id: TODO,v 1.2 2004/03/17 12:35:08 mpasternak Exp $
$Id: TODO,v 1.3 2004/03/17 13:55:08 mpasternak Exp $
Does it compile on NetBSD-stable and NetBSD-current?
FreeBSD-4.9 build confirmed
Does it need perl5?
NetBSD-current (1.6ZI) build confirmed.
"docs" doesn't compile on FreeBSD-STABLE and is hashed out by
patches/patch-aa in Makefile.in . IMVHO docs should be an optional, extra
package so I don't think this is an error -- they are available via gtk.org
in HTML format.
PLIST -- is it complete? Please verify it.
-- dotz@irc.pl

View file

@ -1,11 +1,6 @@
# $NetBSD: buildlink3.mk,v 1.2 2004/03/17 12:03:07 mpasternak Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.3.
# XXX After this file as been verified as correct, the comment lines
# XXX beginning with "XXX" should be removed. Please do not commit
# XXX unverified buildlink[23].mk files.
# $NetBSD: buildlink3.mk,v 1.3 2004/03/17 13:55:08 mpasternak Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
@ -19,24 +14,8 @@ BUILDLINK_PACKAGES+= glib2
BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0
BUILDLINK_PKGSRCDIR.glib2?= ../../wip/glib2-devel
.include "../../mk/bsd.prefs.mk"
.ifdef GLIB_USE_GNU_ICONV
_BUILDLINK_GLIB_USE_GNU_ICONV= ${GLIB_USE_GNU_ICONV}
.else
_BUILDLINK_GLIB_USE_GNU_ICONV= no
.endif
.if ${OPSYS} == "FreeBSD"
_BUILDLINK_GLIB_USE_GNU_ICONV= no
.endif
.if ${_BUILDLINK_GLIB_USE_GNU_ICONV} == [Nn][Oo]
CONFIGURE_ARGS+= --with-libiconv=native
.else
CONFIGURE_ARGS+= --with-libiconv=gnu
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.endif
.endif # GLIB2_BUILDLINK3_MK