Currently only xml2-config is installed, for both the normal libxml2
package as well as the host package. The problem with that is that due
to multilib considerations the build host may have xml2-config installed
with a host triplet prefix, like x86_64-pc-linux-gnu-xml2-config (and
xml2-config as a symbolic link to it). Gentoo for instance sets it up
like this.
Packages may actually search for a prefixed xml2-config before searching
for xml2-config. An example would be Asterisk:
checking for x86_64-pc-linux-gnu-xml2-config... /usr/bin/x86_64-pc-linux-gnu-xml2-config
This then introduces wrong information into the build, for instance
bad includes:
~/tmp/openwrt $ /usr/bin/x86_64-pc-linux-gnu-xml2-config --cflags
-I/usr/include/libxml2
When the intention is to use OpenWrt's own (host) libxml2 one would like
to see this output used instead:
~/tmp/openwrt $ ./staging_dir/hostpkg/bin/xml2-config --cflags
-I/home/sk/tmp/openwrt/staging_dir/hostpkg/include/libxml2
This commit addresses this by installing xml2-config with a suitable
prefix and creating a symbolic link xml2-config. This is done for both
the host package and the normal package. The latter also needs this fix
because the target may use the same triplet as the host system (for
instance x86_64 cross-compiling for x86_64).
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Commit 218f0229a4 added a workaround for a
problem. The host compile overwrote xml2-config in
"$(STAGING_DIR)/host/bin". The workaround fixed the issue for regular
target packages. But it didn't leave a proper xml2-config script for
host packages.
Times have changed. Host packages are now installed in
"$(STAGING_DIR_HOSTPKG). So there is no longer any danger of the host
package overwriting the xml2-config script for target packages. So
revert the mentioned commit, leaving us with two proper xml2-config
scripts, one for target package builds and one for host package builds.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This introduces a libxml2-dev package which contains most stuff
required for developing against libxml2 (on the target), and
the libxml2-utils package which contains the xmllint and xmlcatalog
command line binaries which are provided by libxml2.
Reported-by: Valentín Kivachuk <vk18496@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Also drop the CVE patches which are already covered by this new release.
Compile tested for and run tested on mxs platform.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since version 2.9.2, libxml2 provides its own cmake module. Install it
to avoid packages built with cmake and requiring libxml2 to fall back to
cmake's FindLibXml2 module, which seems to detect host libxml2 instead
of the one in staging_dir.
Fixes#4917.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git
(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Host compilation overwrites "$(STAGING_DIR)/host/bin/xml2-config
with an unpatched variant. So apply the same sed expression before
installing the file during host install.
Thanks to @zyxmon for spotting this.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Beside some improvements, this also fixes several CVEs, for full
list see upstream changelog at:
https://mail.gnome.org/archives/xml/2015-November/msg00012.html
The patch needed for musl was accepted upstream, so we can remove it.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
The previous fix (#557) forced -lz into LDFLAGS instead of fixing the
real issue where configure was failing to detect zlib in the first
place. This was happening because it was looking in /lib, resulting in
conflicts with the host libraries.
Signed-off-by: James Le Cuirot <james.le-cuirot@yakara.com>
Compilation of libxml2 on some distributions is problematic (at least
archlinux) for OpenWrt. This commit fixes the issue. Issue is caused
because configuration for some reason does not find gzopen from zlib.
This patch issues linker to include zlib anyway, if host system doesn't
have this issue, it is not a problem as linker should not link libs
twice anyway.
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
[ Slightly modified commit message ]
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Several packages may depend on host compiled packages during
the build time (such as the new LTS versions of telephony packages).
This commit adds an option to use the libxml2 to be built as
a host package. Usage would be following:
PKG_BUILD_DEPENDS:=libxml2/host
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
Michael Heimpold
Sebastian Kemper
Rosen Penev
Stijn Tintel
Etienne Champetier
Alexander Couzens
James Le Cuirot
Jiri Slachta
Steven Barth