* [PR PATCH] crypto++: readd musl soname linking patch
@ 2019-10-20 11:44 voidlinux-github
2019-10-20 12:20 ` [PR PATCH] [Updated] " voidlinux-github
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages crypto++-fix-musl
https://github.com/void-linux/void-packages/pull/15639
crypto++: readd musl soname linking patch
None
A patch file from https://github.com/void-linux/void-packages/pull/15639.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++-fix-musl-15639.patch --]
[-- Type: text/x-diff, Size: 2781 bytes --]
From 63e636d5b0878ce9651763f250a3e76a7b01cf3c Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 20 Oct 2019 13:43:34 +0200
Subject: [PATCH] crypto++: readd musl soname linking patch
---
.../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++
srcpkgs/crypto++/template | 8 +++----
2 files changed, 26 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
new file mode 100644
index 00000000000..4d9b37e4c63
--- /dev/null
+++ b/srcpkgs/crypto++/patches/musl-soname-links.patch
@@ -0,0 +1,22 @@
+--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200
++++ - 2019-10-20 13:37:32.987528589 +0200
+@@ -1256,7 +1256,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200
++++ - 2019-10-20 13:38:49.796656638 +0200
+@@ -732,7 +732,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index 9fc17a0d4fd..0455de14572 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -4,7 +4,9 @@ version=820
revision=1
create_wrksrc=yes
build_style=gnu-makefile
-make_build_target="libcryptopp.so libcryptopp.a"
+make_build_args="PREFIX=/usr"
+make_build_target="dynamic static libcryptopp.pc"
+make_install_target="install-lib"
hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then
- make_build_args="-f GNUmakefile-cross"
+ make_build_args+=" -f GNUmakefile-cross"
fi
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
post_install() {
- vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
- sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
vlicense License.txt LICENSE
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] crypto++: readd musl soname linking patch
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
@ 2019-10-20 12:20 ` voidlinux-github
2019-10-20 12:20 ` voidlinux-github
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 12:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages crypto++-fix-musl
https://github.com/void-linux/void-packages/pull/15639
crypto++: readd musl soname linking patch
None
A patch file from https://github.com/void-linux/void-packages/pull/15639.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++-fix-musl-15639.patch --]
[-- Type: text/x-diff, Size: 2848 bytes --]
From 9e06bb32476a4481ee712b32c0bff2f9401128bf Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 20 Oct 2019 13:43:34 +0200
Subject: [PATCH] crypto++: readd musl soname linking patch
---
.../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++
srcpkgs/crypto++/template | 10 ++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
new file mode 100644
index 00000000000..4d9b37e4c63
--- /dev/null
+++ b/srcpkgs/crypto++/patches/musl-soname-links.patch
@@ -0,0 +1,22 @@
+--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200
++++ - 2019-10-20 13:37:32.987528589 +0200
+@@ -1256,7 +1256,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200
++++ - 2019-10-20 13:38:49.796656638 +0200
+@@ -732,7 +732,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index 9fc17a0d4fd..d56e7ff2c20 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,10 +1,12 @@
# Template file for 'crypto++'
pkgname=crypto++
version=820
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-makefile
-make_build_target="libcryptopp.so libcryptopp.a"
+make_build_args="PREFIX=/usr"
+make_build_target="dynamic static libcryptopp.pc"
+make_install_target="install-lib"
hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then
- make_build_args="-f GNUmakefile-cross"
+ make_build_args+=" -f GNUmakefile-cross"
fi
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
post_install() {
- vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
- sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
vlicense License.txt LICENSE
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] crypto++: readd musl soname linking patch
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
2019-10-20 12:20 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-20 12:20 ` voidlinux-github
2019-10-20 12:22 ` voidlinux-github
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 12:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages crypto++-fix-musl
https://github.com/void-linux/void-packages/pull/15639
crypto++: readd musl soname linking patch
None
A patch file from https://github.com/void-linux/void-packages/pull/15639.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++-fix-musl-15639.patch --]
[-- Type: text/x-diff, Size: 2848 bytes --]
From 9e06bb32476a4481ee712b32c0bff2f9401128bf Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 20 Oct 2019 13:43:34 +0200
Subject: [PATCH] crypto++: readd musl soname linking patch
---
.../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++
srcpkgs/crypto++/template | 10 ++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
new file mode 100644
index 00000000000..4d9b37e4c63
--- /dev/null
+++ b/srcpkgs/crypto++/patches/musl-soname-links.patch
@@ -0,0 +1,22 @@
+--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200
++++ - 2019-10-20 13:37:32.987528589 +0200
+@@ -1256,7 +1256,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200
++++ - 2019-10-20 13:38:49.796656638 +0200
+@@ -732,7 +732,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index 9fc17a0d4fd..d56e7ff2c20 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,10 +1,12 @@
# Template file for 'crypto++'
pkgname=crypto++
version=820
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-makefile
-make_build_target="libcryptopp.so libcryptopp.a"
+make_build_args="PREFIX=/usr"
+make_build_target="dynamic static libcryptopp.pc"
+make_install_target="install-lib"
hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then
- make_build_args="-f GNUmakefile-cross"
+ make_build_args+=" -f GNUmakefile-cross"
fi
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
post_install() {
- vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
- sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
vlicense License.txt LICENSE
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] crypto++: readd musl soname linking patch
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
2019-10-20 12:20 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-20 12:20 ` voidlinux-github
@ 2019-10-20 12:22 ` voidlinux-github
2019-10-20 12:22 ` voidlinux-github
2019-10-20 12:38 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages crypto++-fix-musl
https://github.com/void-linux/void-packages/pull/15639
crypto++: readd musl soname linking patch
None
A patch file from https://github.com/void-linux/void-packages/pull/15639.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++-fix-musl-15639.patch --]
[-- Type: text/x-diff, Size: 3564 bytes --]
From 450469a99128876d7e004aa0d138308061c2d644 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 20 Oct 2019 13:43:34 +0200
Subject: [PATCH] crypto++: readd musl soname linking patch
otherwise the libcryptopp.so.8 symlink would be missing
also use Makefile generated .pc
---
srcpkgs/crypto++/files/libcrypto++.pc | 11 ----------
.../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++
srcpkgs/crypto++/template | 10 ++++-----
3 files changed, 27 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/crypto++/files/libcrypto++.pc
create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/srcpkgs/crypto++/files/libcrypto++.pc b/srcpkgs/crypto++/files/libcrypto++.pc
deleted file mode 100644
index 3f5d755951d..00000000000
--- a/srcpkgs/crypto++/files/libcrypto++.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Written by Alexander Rødseth <rodseth@gmail.com>
-
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libcrypto++-@@VERSION@@
-Description: Class library of cryptographic schemes
-Version: @@VERSION@@
-Libs: -L${libdir} -lcryptopp
-Cflags: -I${includedir}
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
new file mode 100644
index 00000000000..4d9b37e4c63
--- /dev/null
+++ b/srcpkgs/crypto++/patches/musl-soname-links.patch
@@ -0,0 +1,22 @@
+--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200
++++ - 2019-10-20 13:37:32.987528589 +0200
+@@ -1256,7 +1256,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200
++++ - 2019-10-20 13:38:49.796656638 +0200
+@@ -732,7 +732,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index 9fc17a0d4fd..d56e7ff2c20 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,10 +1,12 @@
# Template file for 'crypto++'
pkgname=crypto++
version=820
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-makefile
-make_build_target="libcryptopp.so libcryptopp.a"
+make_build_args="PREFIX=/usr"
+make_build_target="dynamic static libcryptopp.pc"
+make_install_target="install-lib"
hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then
- make_build_args="-f GNUmakefile-cross"
+ make_build_args+=" -f GNUmakefile-cross"
fi
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
post_install() {
- vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
- sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
vlicense License.txt LICENSE
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] crypto++: readd musl soname linking patch
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
` (2 preceding siblings ...)
2019-10-20 12:22 ` voidlinux-github
@ 2019-10-20 12:22 ` voidlinux-github
2019-10-20 12:38 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages crypto++-fix-musl
https://github.com/void-linux/void-packages/pull/15639
crypto++: readd musl soname linking patch
None
A patch file from https://github.com/void-linux/void-packages/pull/15639.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++-fix-musl-15639.patch --]
[-- Type: text/x-diff, Size: 3564 bytes --]
From 450469a99128876d7e004aa0d138308061c2d644 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 20 Oct 2019 13:43:34 +0200
Subject: [PATCH] crypto++: readd musl soname linking patch
otherwise the libcryptopp.so.8 symlink would be missing
also use Makefile generated .pc
---
srcpkgs/crypto++/files/libcrypto++.pc | 11 ----------
.../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++
srcpkgs/crypto++/template | 10 ++++-----
3 files changed, 27 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/crypto++/files/libcrypto++.pc
create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/srcpkgs/crypto++/files/libcrypto++.pc b/srcpkgs/crypto++/files/libcrypto++.pc
deleted file mode 100644
index 3f5d755951d..00000000000
--- a/srcpkgs/crypto++/files/libcrypto++.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Written by Alexander Rødseth <rodseth@gmail.com>
-
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libcrypto++-@@VERSION@@
-Description: Class library of cryptographic schemes
-Version: @@VERSION@@
-Libs: -L${libdir} -lcryptopp
-Cflags: -I${includedir}
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
new file mode 100644
index 00000000000..4d9b37e4c63
--- /dev/null
+++ b/srcpkgs/crypto++/patches/musl-soname-links.patch
@@ -0,0 +1,22 @@
+--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200
++++ - 2019-10-20 13:37:32.987528589 +0200
+@@ -1256,7 +1256,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200
++++ - 2019-10-20 13:38:49.796656638 +0200
+@@ -732,7 +732,7 @@
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+- $(LDCONF) $(DESTDIR)$(LIBDIR)
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index 9fc17a0d4fd..d56e7ff2c20 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,10 +1,12 @@
# Template file for 'crypto++'
pkgname=crypto++
version=820
-revision=1
+revision=2
create_wrksrc=yes
build_style=gnu-makefile
-make_build_target="libcryptopp.so libcryptopp.a"
+make_build_args="PREFIX=/usr"
+make_build_target="dynamic static libcryptopp.pc"
+make_install_target="install-lib"
hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then
- make_build_args="-f GNUmakefile-cross"
+ make_build_args+=" -f GNUmakefile-cross"
fi
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
post_install() {
- vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
- sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
vlicense License.txt LICENSE
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: crypto++: readd musl soname linking patch
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
` (3 preceding siblings ...)
2019-10-20 12:22 ` voidlinux-github
@ 2019-10-20 12:38 ` voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-20 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
There's a merged pull request on the void-packages repository
crypto++: readd musl soname linking patch
https://github.com/void-linux/void-packages/pull/15639
Description:
None
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-20 12:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-20 11:44 [PR PATCH] crypto++: readd musl soname linking patch voidlinux-github
2019-10-20 12:20 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-20 12:20 ` voidlinux-github
2019-10-20 12:22 ` voidlinux-github
2019-10-20 12:22 ` voidlinux-github
2019-10-20 12:38 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).