diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-10 07:22:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-08-16 12:50:06 +0000 |
| commit | 04a7dda6a6e34b48dcd5fc98e68dd4751b7ac1b7 (patch) | |
| tree | b06a2339c45cecf61670ba1ff8c18db530a254cc /main/abuild/0002-abuild-add-provides-information.patch | |
| parent | 210db07a31ce1ef69640bd2c0f69aae398762ca2 (diff) | |
| download | aports-04a7dda6a6e34b48dcd5fc98e68dd4751b7ac1b7.tar.bz2 aports-04a7dda6a6e34b48dcd5fc98e68dd4751b7ac1b7.tar.xz | |
main/abuild: more provides fixes
need special handling when file name is .so (no version number suffix)
and soname has a version number suffix. This is so we dont set provides
version to 0 when it should have been something else.
This fixes issue with libgcj/gcc-java who ships a file libgcj_bc.so with
soname libgcj_bc.so.1 in addition to the libgcj_bc.so.1.0.0 file.
We cannot have 2 provides with same name but with different version.
Diffstat (limited to 'main/abuild/0002-abuild-add-provides-information.patch')
| -rw-r--r-- | main/abuild/0002-abuild-add-provides-information.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/main/abuild/0002-abuild-add-provides-information.patch b/main/abuild/0002-abuild-add-provides-information.patch deleted file mode 100644 index a4ea86964..000000000 --- a/main/abuild/0002-abuild-add-provides-information.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 76e93e602f74e0fcf8cfc708fd93b4f71b74781e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 4 Sep 2012 13:37:26 +0000 -Subject: [PATCH 2/2] abuild: add provides information - ---- - abuild.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 3acec46..207cc66 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -919,8 +919,11 @@ trace_apk_deps() { - fi - done - -- [ -z "$autodeps" ] && return 0 - echo "# automatically detected:" >> "$dir"/.PKGINFO -+ if [ -f "$dir"/.provides-so ]; then -+ sed 's/^/provides = /' "$dir"/.provides-so >> "$dir"/.PKGINFO -+ fi -+ [ -z "$autodeps" ] && return 0 - for i in $autodeps; do - echo "depend = $i" >> "$dir"/.PKGINFO - done --- -1.7.12 - |