diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-08-26 15:57:07 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-08-26 15:57:07 +0400 |
| commit | 966022af1b83e36a2187108d27cc8ab6fe88373b (patch) | |
| tree | e0ee0473d61fedd552008a5b0080603224bd9f53 | |
| parent | 608449b06844b145b43985a284c6109528472c53 (diff) | |
| download | illumos-packaging-966022af1b83e36a2187108d27cc8ab6fe88373b.tar.gz | |
Make sure libssp.so.0 is always found
| -rw-r--r-- | libc/debian/changelog | 2 | ||||
| -rwxr-xr-x | libc/debian/rules | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libc/debian/changelog b/libc/debian/changelog index 2f402ce..d76d96b 100644 --- a/libc/debian/changelog +++ b/libc/debian/changelog @@ -1,6 +1,6 @@ libc (2.10+4) UNRELEASED; urgency=low - * Added -lssp to libc.so linker script + * Added /usr/lib/$(DEB_HOST_MULTIARCH)/libssp.so.0 to libc.so linker script * Added illumos-3787.patch: 3787 gcc4.7 __cplusplus change incompatibility 3823 wchar.h and wctype_iso.h incompatibility diff --git a/libc/debian/rules b/libc/debian/rules index 86caca6..2822b51 100755 --- a/libc/debian/rules +++ b/libc/debian/rules @@ -216,7 +216,8 @@ install-stamp: build-stamp ln -sf libc.so debian/tmp/usr/lib32/libthread.so : # Make everybody happy: rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libc.so - echo 'INPUT(libc.so.1 AS_NEEDED(-lsocket -lnsl -lresolv -liconv -lssp))' > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libc.so + echo 'INPUT(libc.so.1 AS_NEEDED(-lsocket -lnsl -lresolv -liconv /usr/lib/$(DEB_HOST_MULTIARCH)/libssp.so.0))' \ + > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libc.so : # Even sunld: ln -sf libc.so.1 debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libc.so |