diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-09-06 17:42:20 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-09-06 17:42:20 +0800 |
| commit | 16a6969facf4dd87b8026c641b78aa7cd90d1bbf (patch) | |
| tree | 26ff708855fb04b99b2287ac19ad9dde7c7bff83 /devel/glib20/Makefile | |
| parent | 5c4f626a9876372e2b5990bc79bdaa2869992772 (diff) | |
| download | marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.gz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.bz2 marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.lz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.xz marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.tar.zst marcuscom-ports-16a6969facf4dd87b8026c641b78aa7cd90d1bbf.zip | |
Sync with ports, catch up with recent iconv changes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18672 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/Makefile')
| -rw-r--r-- | devel/glib20/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 176d6c4bb..be0e2b4e0 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,5 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> -# $FreeBSD: head/devel/glib20/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD: head/devel/glib20/Makefile 326307 2013-09-04 18:06:07Z madpilot $ # $MCom$ PORTNAME= glib @@ -23,13 +23,13 @@ PORTSCOUT= limitw:1,even LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ ffi:${PORTSDIR}/devel/libffi -USES= gettext gmake iconv pathfix pkgconfig shebangfix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes +USES= gettext gmake iconv pathfix pkgconfig shebangfix USE_GNOME= ltverhack USE_PYTHON= 2.5+ USE_PERL5= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ +CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ --with-pcre=system \ @@ -54,6 +54,12 @@ CONFIGURE_ARGS+=--disable-dtrace #CONFIGURE_ARGS+=--enable-dtrace #.endif +.if exists(/usr/include/iconv.h) && ${OSVERSION} >= 1000043 +CONFIGURE_ARGS+= --with-libiconv=native +.else +CONFIGURE_ARGS+= --with-libiconv=gnu +.endif + .if ${ARCH} == powerpc64 EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64 .endif |