Makefile.am | 2 +-
Makefile.in | 2 +-
lib/libadminutil/genrb_wrapper.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6a23fa916a7761a6e48f3b79d07f8208cf10f4bf
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Jul 15 09:21:41 2010 -0600
Bug 614690 - adminutil ICU RB generation can fail
https://bugzilla.redhat.com/show_bug.cgi?id=614690
Resolves: bug 614690
Bug Description: adminutil ICU RB generation can fail
Reviewed by: rmeggins
Branch: HEAD
Fix Description: genrb fails on HP-UX because genrb_wrapper.sh invokes it like:
LD_LIBRARY_PATH=/wherever exec genrb
POSIX shell on HP-UX doesn't pass the environment variable to the exec'd
process. Can the exec just be removed?
Another thing I noticed which isn't platform specific is that it tries to
invoke the genrb_wrapper.sh script while assuming cwd is the build root. For
example, if we're in adminutil/HP-UXB.11.23_ia64_64_OPT.OBJ it tries to invoke
lib/libadminutil/genrb_wrapper.sh when it should be
../lib/libadminutil/genrb_wrapper.sh.
Platforms tested: HP-UX
Flag Day: no
Doc impact: no
diff --git a/Makefile.am b/Makefile.am
index a9d4a1a..3cb5914 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,7 +96,7 @@ pkgconfig_DATA= $(PACKAGE_NAME).pc
#
#////////////////////////////////////////////////////////////////
root.res:
- sh -x lib/libadminutil/genrb_wrapper.sh "@icu_bin@" "@icu_libdir@"
-s$(srcdir)/lib/libadminutil -d. \
+ sh -x $(srcdir)/lib/libadminutil/genrb_wrapper.sh "@icu_bin@"
"@icu_libdir@" -s$(srcdir)/lib/libadminutil -d. \
--encoding ISO_8859-1 libadminutil.properties
en.res en_US.res: root.res
diff --git a/Makefile.in b/Makefile.in
index fd01d4b..fd7c95c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1369,7 +1369,7 @@ uninstall-am: uninstall-adminincDATA uninstall-admsslincDATA \
#
#////////////////////////////////////////////////////////////////
root.res:
- sh -x lib/libadminutil/genrb_wrapper.sh "@icu_bin@" "@icu_libdir@"
-s$(srcdir)/lib/libadminutil -d. \
+ sh -x $(srcdir)/lib/libadminutil/genrb_wrapper.sh "@icu_bin@"
"@icu_libdir@" -s$(srcdir)/lib/libadminutil -d. \
--encoding ISO_8859-1 libadminutil.properties
en.res en_US.res: root.res
diff --git a/lib/libadminutil/genrb_wrapper.sh b/lib/libadminutil/genrb_wrapper.sh
index 53804ab..c6eced0 100644
--- a/lib/libadminutil/genrb_wrapper.sh
+++ b/lib/libadminutil/genrb_wrapper.sh
@@ -31,4 +31,4 @@ fi
icu_bin="$1" ; shift
icu_lib="$1" ; shift
# HP SHLIB_PATH too for old versions of HP-UX
-SHLIB_PATH=$icu_lib:$SHLIB_PATH LD_LIBRARY_PATH=$icu_lib:$LD_LIBRARY_PATH
PATH=$icu_bin:$PATH exec genrb "$@"
+SHLIB_PATH=$icu_lib:$SHLIB_PATH LD_LIBRARY_PATH=$icu_lib:$LD_LIBRARY_PATH
PATH=$icu_bin:$PATH genrb "$@"