Solaris if GCC is used. As this bit is both operating system and compiler
specific we can simple bypass "libtool" which is what must have happened
with the old "libtool".
The build in the non-GCC case or under Linux respectively OSF1 might
still be broken. But I don't have a setup to test that.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
needs -liconv in order to satisfy linkage requirements. This is now
patterned after the approach taken with readline and termlib.
Examples on NetBSD for a package that includes only
gettext-lib/buildlink3.mk:
PREFER_NATIVE= yes
PREFER_PKGSRC= # empty
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= iconv
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= gettext
# This uses the pkgsrc gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= yes
PREFER_PKGSRC= gettext iconv
# This uses the pkgsrc gettext and pkgsrc iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl -liconv"
PREFER_NATIVE= # empty
PREFER_PKGSRC= yes
# This uses the pkgsrc gettext and pkgsrc iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl -liconv"
PREFER_NATIVE= iconv
PREFER_PKGSRC= yes
# This uses the pkgsrc gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= gettext
PREFER_PKGSRC= yes
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
PREFER_NATIVE= gettext iconv
PREFER_PKGSRC= yes
# This uses the native gettext and native iconv, with:
# BUILDLINK_LDADD.gettext == "-lintl"
exists and libiconv is compiled. This restores symmetry between
libiconv.so, libiconv.a and libintl and fixes the build of gettext-tools
on Linux. Bump revision.
New in libiconv-1.12-cp932.patch:
* Changed CP932 converter to use exact mapping table.
* Added WINDOWS-31J, csWINDOWS31J, SJIS-OPEN, SJIS-WIN as aliases for CP932.
* Added EUCJP-MS converter.
* Added EUC-JP-MS, EUCJP-OPEN, EUCJP-WIN as aliases for EUCJP-MS.
New in 1.12:
* The iconv program is now licensed under the GPL version 3, instead of the
GPL version 2. The libiconv library continues to be licensed under LGPL.
* Added RK1048 converter.
* On AIX, an existing system libiconv no longer causes setlocale() to fail.
* Upgraded EUC-KR, JOHAB to include the Korean postal code sign.
2.95.4 on FreeBSD 4.11 without it; with it, pkgsrc wants gcc3-c,
which results in a circular dependency.
The addition of c99 to USE_LANGUAGES appears to have been intended
to benefit IRIX with MIPSPro, so also restore the old behavior of
appending "-c99" to CFLAGS in that case.
New in 1.11:
* The iconv program has new options --unicode-subst, --byte-subst,
--widechar-subst that allow to specify substitutions for characters that
cannot be converted.
* The iconv program now understands long options:
long option equivalent to
--from-code -f
--to-code -t
--list -l
--silent -s
* The CP936 converter is now different from the GBK converter: it has changed
to include the Euro sign and private area characters. CP936 is no longer an
alias of GBK.
* Updated GB18030 converter to include all private area characters.
* Updated CP950 converter to include the Euro sign and private area characters.
* Updated CP949 converter to include private area characters.
* Updated the BIG5-HKSCS converter. The old BIG5-HKSCS converter is renamed to
BIG5-HKSCS:1999 and updated to Unicode 4. New converters BIG5-HKSCS:2001 and
BIG5-HKSCS:2004 are added. BIG5-HKSCS is now an alias for BIG5-HKSCS:2004.
* Added a few irreversible mappings to the CP932 converter.
* Tidy up the list of symbols exported from libiconv (assumes gcc >= 4.0).
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.
For example, "make show-buildlink3" in fonts/Xft2 displays:
zlib
fontconfig
iconv
zlib
freetype2
expat
freetype2
Xrender
renderproto
where glibc has its own gettext functions and the configure script
was picking it up and as a result the install process copied a lot of
*.mo files into ${PREFIX}.
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
approved by wiz.
Bump PKGREVISION.
New in libiconv-1.10-ja.patch:
* Changed EUC-JP, SHIFT_JIS, ISO-2022-JP, ISO-2022-JP-1, ISO-2022-JP-2,
ISO-2022-JP-3, DEC-KANJI converters, so that JIS X 0208 1-29(0x815C )EM DASH
is converted into U+2014 EM DASH instead of U+2015 HORIZONTAL BAR.
* Changed SHIFT_JIS, SHIFT_JISX0213, ISO-2022-JP, ISO-2022-JP-1, ISO-2022-JP-2,
ISO-2022-JP-3 converters, so that JIS X 0201 5/12(0x5C) YEN SIGN is
converted into U+005C REVERSE SOLIDUS instead of U+00A5 YEN SIGN and
JIS X 0201 7/14(0x7E) OVER LINE is converted into U+007E TILDE instead of
U+203E OVER LINE.
* Changed EUC-JP, SHIFT_JIS converters to exclude UDC mappings.
* Added Shift_JIS-MS, SJIS-MS,
MS932 as aliases for CP932.
* Added CP51932 converter.
* Added ISO-2022-JP-MS converter.
* Added CP50221 as aliases for ISO-2022-JP-MS.
New in libiconv-1.10-ja-1.patch:
* Fixed output JIS X 0201 kata-kana character as raw 8bit when converted to
iso-2022-jp-ms.
* Fixed check tests/SHIFT_JISX0213.TXT
* Add WINDOWS-932 as alias of CP932.
* Add WINDOWS-51932 and MS51932 as alias of CP51932.
* Add WINDOWS-50221 and MS50221 as alias of ISO-2022-JP-MS.
* Add eucjpms (from MySQL) as alias of eucJP-ms.
* Introduce CHARSET_ALIAS environment variable support.
Example)
with /bin/sh:
$ CHARSET_ALIAS="Shift_JIS=WINDOWS-932:EUC-JP=EUC-JP-MS:ISO-2022-JP=ISO-2022-JP-MS"
$ export CHARSET_ALIAS
CONF_FILES since we need it to always be present for libiconv to
function properly. It's now no longer removed automatically at
deinstallation if it differs from the stock charset.alias file, meaning
it's now preserved in case the user made modifications to the file;
however a warning will be output that the file can be safely removed
if you don't need it anymore. Bump the PKGREVISION to 1.
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
* Added ISO-8859-11 converter.
* Updated the ISO-8859-7 converter.
* Added ATARIST converter, available through --enable-extra-encodings.
* Added BIG5-2003 converter (experimental), available through
--enable-extra-encodings.
* Updated EUC-TW converter to include the Euro sign.
* The preloadable library has been renamed from libiconv_plug.so to
preloadable_libiconv.so.
* Portability to mingw.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
