diff options
| author | jlam <jlam> | 2002-12-25 06:00:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-12-25 06:00:41 +0000 |
| commit | e87651b8c2beddf5c5e256308eca778162ad73da (patch) | |
| tree | 9b2dc0c61159734b27ad179ce418d0a1c6dff86b /mk/buildlink2 | |
| parent | d3c296fa9468431d734b538c302484b81acf9d71 (diff) | |
| download | pkgsrc-e87651b8c2beddf5c5e256308eca778162ad73da.tar.gz | |
Let p:path convert both:
path/subpath/libfoo.so => -Lpath/subpath -lfoo
and
path/libfoo.so => -Lpath -lfoo
This fixes converting /usr/lib/libintl.so into "-L/usr/lib -lintl", which
wasn't happening before.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/gen-transform.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/buildlink2/gen-transform.sh b/mk/buildlink2/gen-transform.sh index 49197dae89f..608e5f3b774 100644 --- a/mk/buildlink2/gen-transform.sh +++ b/mk/buildlink2/gen-transform.sh @@ -9,8 +9,8 @@ untransform="@_BLNK_UNTRANSFORM_SEDFILE@" # I:src:dst translates "-Isrc" into "-Idst" # L:src:dst translates "-Lsrc" into "-Ldst" # l:foo:bar translates "-lfoo" into "-lbar" -# p:path translates "/usr/pkg/lib/libfoo.{a,so}" into -# "-L/usr/pkg/lib -lfoo" +# p:path translates "path/*/libfoo.so" into +# "-Lpath/* -lfoo" # r:dir removes "dir" and "dir/*" # S:foo:bar translates word "foo" into "bar" # s:foo:bar translates "foo" into "bar" @@ -70,6 +70,7 @@ EOF transform|untransform) @CAT@ >> $sedfile << EOF s|\($2/[^ "':;]*\)/lib\([^ /"':;]*\)\.so|-L\1 -l\2|g +s|\($2\)/lib\([^ /"':;]*\)\.so|-L\1 -l\2|g EOF ;; esac |