diff options
author | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
---|---|---|
committer | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
commit | 41290677b018da2819144b0188ac8bd1b91a88e4 (patch) | |
tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /x11-toolkits | |
parent | 02239bfdfc92a832c32cc57d07d3a1a4b3fc4ad9 (diff) | |
download | freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.gz freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.zst freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.zip |
- Make ports use the libc provided iconv implementation on 10-CURRENT
after r254273
- Fix a bunch of ports to properly work after this
- Mark converters/libiconv as IGNORE for systems with iconv in libc
Reviewed by: bapt
Approved by: portmgr (bapt)
Discussed with: bapt, bsam (who both contributed ideas and code)
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/open-motif/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/wxgtk26/Makefile | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 7e8cfec373a2..aa5588ae0de8 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -30,7 +30,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_ENV= LANG=C CPPFLAGS+= -DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include -LDFLAGS+= -L${PREFIX}/lib -liconv USE_CSTD= gnu89 DEMOS_SRC= ${WRKSRC}/demos/programs diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 1dc28cc892ef..88a50654e667 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}"\ X11BASE="${LOCALBASE}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist |