[patch] Patch

bzip2.patch (text/plain), 4.22 KB, created by Arfrever Frehtes Taifersar Arahesis on 2020-04-11 07:43:45 UTC

From f7af4e3da6083a88162be75055b4543a42bc4b07 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Sat, 11 Apr 2020 07:35:36 +0000
Subject: [PATCH] app-arch/bzip2: Fix soname of library in 1.0.7 and 1.0.8.

Change soname of library from "libbz2.so.1.0" to "libbz2.so.1".
Soname "libbz2.so.1" is also used by previous version (1.0.6) and by
new build systems (both Meson and CMake) available in next version.

Closes: https://bugs.gentoo.org/695178
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 app-arch/bzip2/{bzip2-1.0.7.ebuild => bzip2-1.0.7-r1.ebuild} | 0
 app-arch/bzip2/{bzip2-1.0.8.ebuild => bzip2-1.0.8-r1.ebuild} | 0
 app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch     | 2 +-
 app-arch/bzip2/files/bzip2-1.0.7-saneso.patch                | 2 +-
 app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch     | 2 +-
 app-arch/bzip2/files/bzip2-1.0.8-saneso.patch                | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename app-arch/bzip2/{bzip2-1.0.7.ebuild => bzip2-1.0.7-r1.ebuild} (100%)
 rename app-arch/bzip2/{bzip2-1.0.8.ebuild => bzip2-1.0.8-r1.ebuild} (100%)

diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
similarity index 100%
rename from app-arch/bzip2/bzip2-1.0.7.ebuild
rename to app-arch/bzip2/bzip2-1.0.7-r1.ebuild
diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
similarity index 100%
rename from app-arch/bzip2/bzip2-1.0.8.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r1.ebuild
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
index 977d9b3cd30..64cca58eac3 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
 -	rm -f libbz2.so.1.0
 -	ln -s libbz2.so.1.0.7 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
index 5ab0cb52d05..d63226684f6 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 +	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
  	rm -f libbz2.so.1.0
  	ln -s libbz2.so.1.0.7 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
index 4a641fdb2e8..04818265b7e 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
 -	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
 -	rm -f libbz2.so.1.0
 -	ln -s libbz2.so.1.0.8 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
index 08430831baa..63409f5a857 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
 -	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
 +	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
  	rm -f libbz2.so.1.0
  	ln -s libbz2.so.1.0.8 libbz2.so.1.0
-- 
2.26.0