mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
20d63ebc94
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>
47 lines
837 B
Diff
47 lines
837 B
Diff
--- 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 \
|