diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-04-04 11:08:10 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-04-04 11:10:11 (EDT) |
| commit | d342f07fee62d05c7b8d879a8b8e977290b39cef (patch) | |
| tree | ff24423cd84e252ff19883bf22cb925b51c8a763 | |
| parent | de0f8b73a539d239d043d5052831f6df723edd20 (diff) | |
Generate /etc/ld.so.conf.d/*.
| -rwxr-xr-x | build | 11 | ||||
| -rw-r--r-- | ld.so.conf | 4 | ||||
| -rw-r--r-- | libc.6.pkg/files | 1 |
3 files changed, 9 insertions, 7 deletions
@@ -78,9 +78,15 @@ build: build-libc build-locales install-libc: build-libc # Install /etc/ld.so.conf early to silence a warning from ldconfig. - mkdir -p dest/etc - cp ../ld.so.conf dest/etc + mkdir -p dest/etc/ld.so.conf.d + printf 'include /etc/ld.so.conf.d/*.conf\n' \ + >'dest/etc/ld.so.conf' + printf '/usr/local/lib\n/opt/lib\n' \ + >'dest/etc/ld.so.conf.d/local' + printf '/lib/$(OPK_HOST_ARCH)\n/usr/lib/$(OPK_HOST_ARCH)\n' \ + >'dest/etc/ld.so.conf.d/$(OPK_HOST_ARCH)' oh-autoinstall -s "$${PWD}/src/libc" -B libcbuild + rm -f dest/etc/ld.so.cache rm -f dest/var/db/Makefile \ dest/sbin/sln \ dest/usr/bin/makedb \ @@ -95,7 +101,6 @@ install-libc: build-libc cp ../nsswitch.conf dest/etc cp src/libc/posix/gai.conf dest/etc cp src/libc/nscd/nscd.conf dest/etc - rm -f dest/etc/ld.so.cache install-locales: build-locales oh-autoinstall -s "$${PWD}/src/localedef" -B localesbuild \ diff --git a/ld.so.conf b/ld.so.conf deleted file mode 100644 index 04f3479..0000000 --- a/ld.so.conf +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/ld.so.conf - -/usr/local/lib -/opt/lib diff --git a/libc.6.pkg/files b/libc.6.pkg/files index a4d2e14..c222a83 100644 --- a/libc.6.pkg/files +++ b/libc.6.pkg/files @@ -2,6 +2,7 @@ /usr/lib/*/gconv /etc/gai.conf /etc/ld.so.conf +/etc/ld.so.conf.d /etc/localtime /etc/nsswitch.conf /etc/rpc |