Github messages for voidlinux
 help / color / mirror / Atom feed
From: hazen2215 <hazen2215@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] plplot: fix build on musl
Date: Sat, 12 Aug 2023 18:55:25 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45564@inbox.vuxu.org> (raw)

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

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

https://github.com/hazen2215/void-packages plplot
https://github.com/void-linux/void-packages/pull/45564

plplot: fix build on musl
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - armv6l-musl (cross)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-plplot-45564.patch --]
[-- Type: text/x-diff, Size: 1238 bytes --]

From 6703c57a86048e73c32eb4e3bacab36e55c5eec0 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 13 Aug 2023 01:33:27 +0900
Subject: [PATCH] plplot: fix build on musl

---
 srcpkgs/plplot/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template
index 221562823b60f..6797603722954 100644
--- a/srcpkgs/plplot/template
+++ b/srcpkgs/plplot/template
@@ -26,10 +26,6 @@ build_options="ada gen_tools"
 desc_option_ada="Enable Ada bindings"
 desc_option_gen_tools="Build files for host required during cross build"
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	broken="PTHREAD_MUTEX_RECURSIVE_NP"
-fi
-
 if ! [ "$CROSS_BUILD" ]; then
 	build_options_default="gen_tools"
 fi
@@ -46,6 +42,13 @@ post_patch() {
 	vsed -i cmake/modules/tcl-related.cmake -e '/if(NOT PLPLOT_TK_VERSION)/ i set(PLPLOT_TK_VERSION ${PLPLOT_TCL_VERSION} CACHE STRING "Tk version found by wish")'
 }
 
+post_configure() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		vsed -i build/plplot_config.h \
+			-e '/PTHREAD_MUTEX_RECURSIVE_NP/s/_NP//'
+	fi
+}
+
 pre_build() {
 	if ! [ "$build_option_gen_tools" ]; then
 		ln -s /usr/lib/qsastime/deltaT-gen build/lib/qsastime

             reply	other threads:[~2023-08-12 16:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-12 16:55 hazen2215 [this message]
2023-08-12 18:14 ` [PR PATCH] [Merged]: " Chocimier

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-45564@inbox.vuxu.org \
    --to=hazen2215@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).