summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-09-19 16:16:29 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-09-19 16:16:29 +0800
commit59551973c7ae8155c8cdc2dcda5eb195a2588e84 (patch)
treee6fbb9d8d8ce09ee18a91d6ef18eb2708829bf9f
parentb41ca11df6b96ae12aaa9048905a5fe72df23f99 (diff)
downloadmarcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar.gz
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar.bz2
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar.lz
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar.xz
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.tar.zst
marcuscom-ports-59551973c7ae8155c8cdc2dcda5eb195a2588e84.zip
Sync with ports, use ICONV_LIB from USES=iconv to check which libiconv
version is available. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18683 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/glib20/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index b7c1da444..12ff36ff3 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -14,7 +14,6 @@ COMMENT= Some useful routines of C programming (current stable version)
LICENSE= LGPL20
-LATEST_LINK= glib20
USE_XZ= yes
PORTSCOUT= limitw:1,even
@@ -53,7 +52,7 @@ CONFIGURE_ARGS+=--disable-dtrace
#CONFIGURE_ARGS+=--enable-dtrace
#.endif
-.if exists(/usr/include/iconv.h) && ${OSVERSION} >= 1000043
+.if empty(ICONV_LIB)
CONFIGURE_ARGS+= --with-libiconv=native
.else
CONFIGURE_ARGS+= --with-libiconv=gnu