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 /emulators/virtualbox-ose | |
| 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 'emulators/virtualbox-ose')
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index c32da908feaa..f31dcec49f1f 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -245,6 +245,9 @@ post-patch: ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure +.if empty(ICONV_LIB) + @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk +.endif pre-build: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ |