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/0001-abuild-use-so-as-namespace-for-provides.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/0001-abuild-use-so-as-namespace-for-provides.patch')
| -rw-r--r-- | main/abuild/0001-abuild-use-so-as-namespace-for-provides.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/main/abuild/0001-abuild-use-so-as-namespace-for-provides.patch b/main/abuild/0001-abuild-use-so-as-namespace-for-provides.patch deleted file mode 100644 index 5b6b1de954..0000000000 --- a/main/abuild/0001-abuild-use-so-as-namespace-for-provides.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a5cc84e229a40d725c1d53d1b0924a9ef9a615e0 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 5 Sep 2012 11:09:57 +0000 -Subject: [PATCH] abuild: use 'so:' as 'namespace' for provides - ---- - abuild.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index f4d724c..ecb7c4d 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -921,7 +921,8 @@ trace_apk_deps() { - - echo "# automatically detected:" >> "$dir"/.PKGINFO - if [ -f "$dir"/.provides-so ]; then -- sed 's/^\(.*\)/provides = \1=0/' "$dir"/.provides-so >> "$dir"/.PKGINFO -+ sed 's/^\(.*\)/provides = so:\1=0/' "$dir"/.provides-so \ -+ >> "$dir"/.PKGINFO - fi - [ -z "$autodeps" ] && return 0 - for i in $autodeps; do --- -1.7.12 - |