summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorgabor <gabor@FreeBSD.org>2011-02-25 00:04:39 +0000
committergabor <gabor@FreeBSD.org>2011-02-25 00:04:39 +0000
commitc91ab1769b1237e3663d59888cebe31ceee47570 (patch)
treeed256cfe2a006269f4a380597f93880be8d5c1cd /Makefile.inc1
parent5aabdb149c1a96a1e9717d45fde4096807423095 (diff)
downloadFreeBSD-src-c91ab1769b1237e3663d59888cebe31ceee47570.zip
FreeBSD-src-c91ab1769b1237e3663d59888cebe31ceee47570.tar.gz
Add the BSD-licensed Citrus iconv to the base system with default off
setting. It can be built by setting the WITH_ICONV knob. While this knob is unset, the library part, the binaries, the header file and the metadata files will not be built or installed so it makes no impact on the system if left turned off. This work is based on the iconv implementation in NetBSD but a great number of improvements and feature additions have been included: - Some utilities have been added. There is a conversion table generator, which can compare conversion tables to reference data generated by GNU libiconv. This helps ensuring conversion compatibility. - UTF-16 surrogate support and some endianness issues have been fixed. - The rather chaotic Makefiles to build metadata have been refactored and cleaned up, now it is easy to read and it is also easier to add support for new encodings. - A bunch of new encodings and encoding aliases have been added. - Support for 1->2, 1->3 and 1->4 mappings, which is needed for transliterating with flying accents as GNU does, like "u. - Lots of warnings have been fixed, the major part of the code is now WARNS=6 clean. - New section 1 and section 5 manual pages have been added. - Some GNU-specific calls have been implemented: iconvlist(), iconvctl(), iconv_canonicalize(), iconv_open_into() - Support for GNU's //IGNORE suffix has been added. - The "-" argument for stdin is now recognized in iconv(1) as per POSIX. - The Big5 conversion module has been fixed. - The iconv.h header files is supposed to be compatible with the GNU version, i.e. sources should build with base iconv.h and GNU libiconv. It also includes a macro magic to deal with the char ** and const char ** incompatibility. - GNU compatibility: "" or "char" means the current local encoding in use - Various cleanups and style(9) fixes. Approved by: delphij (mentor) Obtained from: The NetBSD Project Sponsored by: Google Summer of Code 2009
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc113
1 files changed, 4 insertions, 9 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 102f418..b1fb79f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -452,7 +452,7 @@ build32:
@echo "--------------------------------------------------------------"
@echo ">>> stage 5.1: building 32 bit shim libraries"
@echo "--------------------------------------------------------------"
- mkdir -p ${LIB32TMP}/usr/lib32
+ mkdir -p ${LIB32TMP}/usr/include
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${LIB32TMP}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -496,13 +496,6 @@ build32:
.endfor
distribute32 install32:
-.if make(distribute32)
- mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree
- mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree
-.else
- mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
- mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree
-.endif
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.if ${MK_CDDL} != "no"
cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -1048,7 +1041,9 @@ build-tools:
${_aicasm} \
usr.bin/awk \
lib/libmagic \
- usr.sbin/sysinstall
+ usr.sbin/sysinstall \
+ usr.bin/mkesdb_static \
+ usr.bin/mkcsmapper_static
${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
OpenPOWER on IntegriCloud