diff options
| author | Andy Walsh <andy.walsh44+github@gmail.com> | 2018-02-03 21:00:27 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-03-14 18:49:24 +0100 |
| commit | 20d63ebc942012040e08bb815a94f40e535b9cf9 (patch) | |
| tree | 3245cc17cd74d9794fe1d5f6a0f7dc39e347a164 /package/utils/e2fsprogs/patches | |
| parent | 093b75e10635dcee4a90e0263131aa8d69d251be (diff) | |
| download | upstream-20d63ebc942012040e08bb815a94f40e535b9cf9.tar.gz upstream-20d63ebc942012040e08bb815a94f40e535b9cf9.tar.bz2 upstream-20d63ebc942012040e08bb815a94f40e535b9cf9.zip | |
e2fsprogs: break out libcomerr/libss, FS#1310
libext2fs breaks krb5 by always installing its own copies of libcom_err.so
and libss.so.
Move the libraries into separate libcomerr and libss packages respectively
and add a host build recipe to stage the required compile_et and mk_cmds
utilities for use by other packages.
This allows the krb5 package to be fixed to use the system wide libcomerr
and libss libraries.
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
[rename libcom_err to libcomerr, make compile_et and mk_cmds relocatable,
cleanup makefile, add dependency on host build, reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/utils/e2fsprogs/patches')
| -rw-r--r-- | package/utils/e2fsprogs/patches/000-relocatable.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/utils/e2fsprogs/patches/000-relocatable.patch b/package/utils/e2fsprogs/patches/000-relocatable.patch new file mode 100644 index 0000000000..017aca1b05 --- /dev/null +++ b/package/utils/e2fsprogs/patches/000-relocatable.patch @@ -0,0 +1,46 @@ +--- a/lib/et/compile_et.sh.in ++++ b/lib/et/compile_et.sh.in +@@ -2,9 +2,15 @@ + # + # + +-datarootdir=@datarootdir@ +-AWK=@AWK@ +-DIR=@datadir@/et ++if test "x$STAGING_DIR" = x ; then ++ datarootdir=@datarootdir@ ++ AWK=@AWK@ ++ DIR=@datadir@/et ++else ++ datarootdir="$STAGING_DIR/../hostpkg/share" ++ AWK=awk ++ DIR="$datarootdir/et" ++fi + + if test "$1" = "--build-tree" ; then + shift; +--- a/lib/ss/mk_cmds.sh.in ++++ b/lib/ss/mk_cmds.sh.in +@@ -1,11 +1,17 @@ + #!/bin/sh + # + # +- +-datarootdir=@datarootdir@ +-DIR=@datadir@/ss +-AWK=@AWK@ +-SED=@SED@ ++if test "x$STAGING_DIR" = x ; then ++ datarootdir=@datarootdir@ ++ DIR=@datadir@/ss ++ AWK=@AWK@ ++ SED=@SED@ ++else ++ datarootdir="$STAGING_DIR/../hostpkg/share" ++ DIR="$datarootdir/ss" ++ AWK=awk ++ SED=sed ++fi + + for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |