diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-03-15 22:58:10 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-03-15 22:58:10 +0400 |
| commit | 2ccf76885ebca7dc60a3d9d205dc67ee3b94c332 (patch) | |
| tree | 89b8bfa4dddcc29356c22788e2b9a30f1988df26 | |
| parent | 1ecc04c0bbee03b1cae8e3a1facc56dd375c9adf (diff) | |
| download | dh-illumos-2ccf76885ebca7dc60a3d9d205dc67ee3b94c332.tar.gz | |
dh-illumos (9.5.10) unstable; urgency=mediumv9.5.10
* dh_illumos_gate: use -L instead of -YP in LDLIBS32 and LDLIBS64, so that
proper libraries are used (from debian/tmp)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_illumos_gate | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 21fc10f..18fa8c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dh-illumos (9.5.10) unstable; urgency=medium + + * dh_illumos_gate: use -L instead of -YP in LDLIBS32 and LDLIBS64, so that + proper libraries are used (from debian/tmp) + + -- Igor Pashev <pashev.igor@gmail.com> Sat, 15 Mar 2014 22:57:59 +0400 + dh-illumos (9.5.9) unstable; urgency=medium * dh_illumos_gate: diff --git a/dh_illumos_gate b/dh_illumos_gate index 5878cbd..12d15e2 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -372,8 +372,8 @@ if ( -d 'usr' && ! -f 'usr/env.sh') { print ENV "export DEB_USRLIBDIR_32='/$usrlibdir32'\n"; print ENV "export DEB_LIBDIR_64='/$libdir64'\n"; print ENV "export DEB_USRLIBDIR_64='/$usrlibdir64'\n"; - print ENV "export LDLIBS32=\"-YP,\$ROOT/\$DEB_LIBDIR_32:\$ROOT/\$DEB_USRLIBDIR_32\"\n"; - print ENV "export LDLIBS64=\"-YP,\$ROOT/\$DEB_LIBDIR_64:\$ROOT/\$DEB_USRLIBDIR_64\"\n"; + print ENV "export LDLIBS32=\"-L\$ROOT/\$DEB_LIBDIR_32 -L\$ROOT/\$DEB_USRLIBDIR_32\"\n"; + print ENV "export LDLIBS64=\"-L\$ROOT/\$DEB_LIBDIR_64 -L\$ROOT/\$DEB_USRLIBDIR_64\"\n"; print ENV 'export LDLIBS_NATIVE="', ($bits == 64) ? '$LDLIBS64' : '$LDLIBS32', "\"\n"; print ENV `dpkg-architecture -s`; |