summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-27 14:24:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-09 10:47:50 +0100
commitcf5be676357a2bb389dd74f3fdfe873b9a9a1ed9 (patch)
treef66e4a5b3e8311cefbf7fe231eb8bb6be05800b4 /meta
parentd9c21cc88bb0b0d944bae367029ffc25e244b914 (diff)
downloadpoky-cf5be676357a2bb389dd74f3fdfe873b9a9a1ed9.tar.gz
glibc: Drop obsolete rpc and libnsl
use libnsl2 and rpcsvc-proto packages (From OE-Core rev: 9dc9983901cec364ea57a72b9da1a0396b60663a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-common.bbclass4
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.27.bb1
-rw-r--r--meta/recipes-core/glibc/glibc-initial.inc4
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc5
-rw-r--r--meta/recipes-core/glibc/glibc.inc4
-rw-r--r--meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch123
-rw-r--r--meta/recipes-core/glibc/glibc_2.27.bb18
8 files changed, 6 insertions, 155 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 9ea2c03749..0e351b6746 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -1,9 +1,5 @@
1do_install() { 1do_install() {
2 oe_runmake install_root=${D} install 2 oe_runmake install_root=${D} install
3 for r in ${rpcsvc}; do
4 h=`echo $r|sed -e's,\.x$,.h,'`
5 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
6 done
7 install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf 3 install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf
8 install -d ${D}${localedir} 4 install -d ${D}${localedir}
9 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" 5 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 9620ad48de..5aa3434ec7 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -14,7 +14,7 @@ DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 irda largefile pcmcia u
14DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ 14DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
15 libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ 15 libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
16 libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \ 16 libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \
17 libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ 17 libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \
18 libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ 18 libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
19 libc-posix-wchar-io" 19 libc-posix-wchar-io"
20DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" 20DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
index 5e92eb71d5..6a26376ac2 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
@@ -32,7 +32,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
32 file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ 32 file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \
33 file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ 33 file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \
34 file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 34 file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \
35 file://0021-eglibc-Install-PIC-archives.patch \
36 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 35 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
37 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 36 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
38 file://archive-path.patch \ 37 file://archive-path.patch \
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
index b86e2fb2db..28f006fc7f 100644
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ b/meta/recipes-core/glibc/glibc-initial.inc
@@ -13,9 +13,9 @@ do_configure () {
13 cfgscript=`python3 -c "import os; print(os.path.relpath('${S}', '.'))"`/configure 13 cfgscript=`python3 -c "import os; print(os.path.relpath('${S}', '.'))"`/configure
14 $cfgscript --host=${TARGET_SYS} --build=${BUILD_SYS} \ 14 $cfgscript --host=${TARGET_SYS} --build=${BUILD_SYS} \
15 --prefix=/usr \ 15 --prefix=/usr \
16 --without-cvs --disable-sanity-checks \ 16 --disable-sanity-checks \
17 --with-headers=${STAGING_DIR_TARGET}${includedir} \ 17 --with-headers=${STAGING_DIR_TARGET}${includedir} \
18 --enable-hacker-mode --enable-addons 18 --enable-hacker-mode
19} 19}
20 20
21do_compile () { 21do_compile () {
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 728bc5381f..ae3f2f63a5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -28,7 +28,7 @@ FILES_sln = "${base_sbindir}/sln"
28FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" 28FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
29FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" 29FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
30FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" 30FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
31FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" 31FILES_${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
32FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" 32FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
33FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ 33FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
34 ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" 34 ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd"
@@ -51,7 +51,7 @@ DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services."
51SUMMARY_ldd = "print shared library dependencies" 51SUMMARY_ldd = "print shared library dependencies"
52DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." 52DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line."
53SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc" 53SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc"
54DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, rpcgen, ..." 54DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..."
55DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" 55DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
56DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" 56DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
57 57
@@ -71,7 +71,6 @@ do_install_append () {
71 if [ -f ${D}${bindir}/mtrace ]; then 71 if [ -f ${D}${bindir}/mtrace ]; then
72 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace 72 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
73 fi 73 fi
74 rm -rf ${D}${includedir}/rpcsvc/rquota*
75 # Info dir listing isn't interesting at this point so remove it if it exists. 74 # Info dir listing isn't interesting at this point so remove it if it exists.
76 if [ -e "${D}${infodir}/dir" ]; then 75 if [ -e "${D}${infodir}/dir" ]; then
77 rm -f ${D}${infodir}/dir 76 rm -f ${D}${infodir}/dir
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index ce1222be68..3db55f926f 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -33,8 +33,6 @@ siteconfig_do_siteconfig_gencache_prepend = " \
33 33
34# nptl needs unwind support in gcc, which can't be built without glibc. 34# nptl needs unwind support in gcc, which can't be built without glibc.
35DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" 35DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial"
36# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
37#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
38 36
39CRYPTPROVIDES = "virtual/crypt" 37CRYPTPROVIDES = "virtual/crypt"
40CRYPTPROVIDES_class-nativesdk = "" 38CRYPTPROVIDES_class-nativesdk = ""
@@ -80,8 +78,6 @@ do_configure_prepend() {
80 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in 78 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
81} 79}
82 80
83GLIBC_ADDONS ?= "nptl,libidn"
84
85# Enable backtrace from abort() 81# Enable backtrace from abort()
86do_configure_append_arm () { 82do_configure_append_arm () {
87 echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms 83 echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
deleted file mode 100644
index 530f4e1087..0000000000
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
+++ /dev/null
@@ -1,123 +0,0 @@
1From c1beab8a11985f96f5eb644e7103d343b705afc6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:57:01 +0000
4Subject: [PATCH 21/27] eglibc: Install PIC archives
5
6Forward port from eglibc
7
82008-02-07 Joseph Myers <joseph@codesourcery.com>
9
10 * Makerules (install-extras, install-map): New variables.
11 (installed-libcs): Add libc_pic.a.
12 (install-lib): Include _pic.a files for versioned shared
13 libraries.
14 (install-map-nosubdir, install-extras-nosubdir): Add rules for
15 installing extra files.
16 (install-no-libc.a-nosubdir): Depend on install-map-nosubdir and
17 install-extras-nosubdir.
18
192008-04-01 Maxim Kuvyrkov <maxim@codesourcery.com>
20
21 * Makerules (install-lib): Don't install libpthread_pic.a.
22 (install-map): Don't install libpthread_pic.map.
23
24Upstream-Status: Pending
25
26Signed-off-by: Khem Raj <raj.khem@gmail.com>
27---
28 Makerules | 42 ++++++++++++++++++++++++++++++++++++++++--
29 1 file changed, 40 insertions(+), 2 deletions(-)
30
31diff --git a/Makerules b/Makerules
32index ef6abeac6d..eeaa667f49 100644
33--- a/Makerules
34+++ b/Makerules
35@@ -778,6 +778,9 @@ ifeq ($(build-shared),yes)
36 $(common-objpfx)libc.so: $(common-objpfx)libc.map
37 endif
38 common-generated += libc.so libc_pic.os
39+ifndef subdir
40+install-extras := soinit.o sofini.o
41+endif
42 ifdef libc.so-version
43 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
44 $(make-link)
45@@ -1029,6 +1032,7 @@ endif
46
47 install: check-install-supported
48
49+installed-libcs := $(installed-libcs) $(inst_libdir)/libc_pic.a
50 install: $(installed-libcs)
51 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
52 $(make-target-directory)
53@@ -1057,6 +1061,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\
54 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
55 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
56
57+# Install the _pic.a files for versioned libraries, and corresponding
58+# .map files.
59+# libpthread_pic.a breaks mklibs, so don't install it and its map.
60+install-lib := $(install-lib) $(install-lib.so-versioned:%.so=%_pic.a)
61+install-lib := $(filter-out libpthread_pic.a,$(install-lib))
62+# Despite having a soname libhurduser and libmachuser do not use symbol
63+# versioning, so don't install the corresponding .map files.
64+ifeq ($(build-shared),yes)
65+install-map := $(patsubst %.so,%.map,\
66+ $(foreach L,$(install-lib.so-versioned),$(notdir $L)))
67+install-map := $(filter-out libhurduser.map libmachuser.map libpthread.map,$(install-map))
68+ifndef subdir
69+install-map := $(install-map) libc.map
70+endif
71+endif
72+
73 # For versioned libraries, we install three files:
74 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
75 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
76@@ -1311,9 +1331,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \
77 endif # headers-nonh
78 endif # headers
79
80+ifdef install-map
81+$(addprefix $(inst_libdir)/,$(patsubst lib%.map,lib%_pic.map,$(install-map))): \
82+ $(inst_libdir)/lib%_pic.map: $(common-objpfx)lib%.map $(+force)
83+ $(do-install)
84+endif
85+
86+ifdef install-extras
87+$(addprefix $(inst_libdir)/libc_pic/,$(install-extras)): \
88+ $(inst_libdir)/libc_pic/%.o: $(elf-objpfx)%.os $(+force)
89+ $(do-install)
90+endif
91+
92 .PHONY: install-bin-nosubdir install-bin-script-nosubdir \
93 install-rootsbin-nosubdir install-sbin-nosubdir install-lib-nosubdir \
94- install-data-nosubdir install-headers-nosubdir
95+ install-data-nosubdir install-headers-nosubdir install-map-nosubdir \
96+ install-extras-nosubdir
97 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
98 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
99 install-rootsbin-nosubdir: \
100@@ -1326,6 +1359,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
101 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
102 install-others-nosubdir: $(install-others)
103 install-others-programs-nosubdir: $(install-others-programs)
104+install-map-nosubdir: $(addprefix $(inst_libdir)/,\
105+ $(patsubst lib%.map,lib%_pic.map,$(install-map)))
106+install-extras-nosubdir: $(addprefix $(inst_libdir)/libc_pic/,\
107+ $(install-extras))
108
109 # We need all the `-nosubdir' targets so that `install' in the parent
110 # doesn't depend on several things which each iterate over the subdirs.
111@@ -1335,7 +1372,8 @@ install-%:: install-%-nosubdir ;
112
113 .PHONY: install install-no-libc.a-nosubdir
114 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
115- install-lib-nosubdir install-others-nosubdir
116+ install-lib-nosubdir install-others-nosubdir \
117+ install-map-nosubdir install-extras-nosubdir
118 ifeq ($(build-programs),yes)
119 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
120 install-rootsbin-nosubdir install-sbin-nosubdir \
121--
1222.16.1
123
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.27.bb
index c814798bbd..d3bdeaefc3 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -35,7 +35,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
35 file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ 35 file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \
36 file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ 36 file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \
37 file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 37 file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \
38 file://0021-eglibc-Install-PIC-archives.patch \
39 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 38 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
40 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 39 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
41 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ 40 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
@@ -76,14 +75,11 @@ COMPATIBLE_HOST_libc-musl_class-target = "null"
76GLIBCPIE ??= "" 75GLIBCPIE ??= ""
77 76
78EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 77EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
79 --without-cvs --disable-profile \ 78 --disable-profile \
80 --disable-debug --without-gd \ 79 --disable-debug --without-gd \
81 --enable-clocale=gnu \ 80 --enable-clocale=gnu \
82 --enable-add-ons=libidn \
83 --with-headers=${STAGING_INCDIR} \ 81 --with-headers=${STAGING_INCDIR} \
84 --without-selinux \ 82 --without-selinux \
85 --enable-obsolete-rpc \
86 --enable-obsolete-nsl \
87 --enable-tunables \ 83 --enable-tunables \
88 --enable-bind-now \ 84 --enable-bind-now \
89 --enable-stack-protector=strong \ 85 --enable-stack-protector=strong \
@@ -113,22 +109,10 @@ do_configure () {
113 CPPFLAGS="" oe_runconf 109 CPPFLAGS="" oe_runconf
114} 110}
115 111
116rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
117 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
118 rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
119
120do_compile () { 112do_compile () {
121 # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging 113 # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
122 unset LDFLAGS 114 unset LDFLAGS
123 base_do_compile 115 base_do_compile
124 (
125 cd ${S}/sunrpc/rpcsvc
126 for r in ${rpcsvc}; do
127 h=`echo $r|sed -e's,\.x$,.h,'`
128 rm -f $h
129 ${B}/sunrpc/cross-rpcgen -h $r -o $h || bbwarn "${PN}: unable to generate header for $r"
130 done
131 )
132 echo "Adjust ldd script" 116 echo "Adjust ldd script"
133 if [ -n "${RTLDLIST}" ] 117 if [ -n "${RTLDLIST}" ]
134 then 118 then