Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] cackey: remove rpath, fix cross build
Date: Tue, 23 Feb 2021 15:28:16 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28999@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages cackey-no-rpath
https://github.com/void-linux/void-packages/pull/28999

cackey: remove rpath, fix cross build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28999.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cackey-no-rpath-28999.patch --]
[-- Type: text/x-diff, Size: 2029 bytes --]

From 4ab93adbf34abc99a3116e590682168724d00b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 23 Feb 2021 21:26:02 +0700
Subject: [PATCH] cackey: remove rpath, fix cross build

---
 srcpkgs/cackey/patches/no-rpath.patch | 14 ++++++++++++++
 srcpkgs/cackey/template               |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cackey/patches/no-rpath.patch

diff --git a/srcpkgs/cackey/patches/no-rpath.patch b/srcpkgs/cackey/patches/no-rpath.patch
new file mode 100644
index 00000000000..11384655aa7
--- /dev/null
+++ b/srcpkgs/cackey/patches/no-rpath.patch
@@ -0,0 +1,14 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -212,9 +212,6 @@ fi
+ dnl Set version script, to limit the scope of symbols
+ DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
+ 
+-dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
+-DC_SYNC_RPATH
+-
+ dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
+ DC_SYNC_SHLIBOBJS
+ 
diff --git a/srcpkgs/cackey/template b/srcpkgs/cackey/template
index fecb150a805..468dcd1c7b1 100644
--- a/srcpkgs/cackey/template
+++ b/srcpkgs/cackey/template
@@ -3,7 +3,8 @@ pkgname=cackey
 version=0.7.10
 revision=1
 build_style=gnu-configure
-makedepends="pcsclite-devel"
+hostmakedepends="automake"
+makedepends="pcsclite-devel zlib-devel"
 depends="pcsc-tools"
 short_desc="PKCS#11 provider library for using smart cards"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -11,6 +12,11 @@ license="MIT"
 homepage="http://www.rkeene.org/projects/info/wiki/161"
 distfiles="http://cackey.rkeene.org/download/$version/cackey-$version.tar.gz"
 checksum=e2074055bab8eb1c277bfa3355767c50f792d5b87bf41f9c0d1af0e77f311583
+CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/PCSC"
+
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	vlicense LICENSE

             reply	other threads:[~2021-02-23 14:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-23 14:28 sgn [this message]
2021-02-24  0:03 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28999@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).