pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libxlsxwriter: Patch hardcoded prefix on macOS



Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Thu Dec 13 09:26:25 2018 +0100
Changeset:	f99478bfac1355c4f4af353066fec47752f54ccb

Modified Files:
	libxlsxwriter/distinfo
Added Files:
	libxlsxwriter/patches/patch-src_Makefile
Removed Files:
	libxlsxwriter/TODO

Log Message:
libxlsxwriter: Patch hardcoded prefix on macOS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f99478bfac1355c4f4af353066fec47752f54ccb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxlsxwriter/TODO                       | 11 -----------
 libxlsxwriter/distinfo                   |  1 +
 libxlsxwriter/patches/patch-src_Makefile | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diffs:
diff --git a/libxlsxwriter/TODO b/libxlsxwriter/TODO
deleted file mode 100644
index 15c3c9f626..0000000000
--- a/libxlsxwriter/TODO
+++ /dev/null
@@ -1,11 +0,0 @@
-stage-install fails on macOS:
-
-  => Checking for missing run-time search paths in libxlsxwriter-0.8.4
-  ERROR: lib/libxlsxwriter.dylib: missing library: /usr/lib/libxlsxwriter.dylib
-
-Seems to be caused by this bit in src/Makefile:
-
-  SOFLAGS = -dynamiclib $(FPIC) -install_name /usr/lib/$(LIBXLSXWRITER_SO)
-
-Upstream issue:
-https://github.com/jmcnamara/libxlsxwriter/issues/209
diff --git a/libxlsxwriter/distinfo b/libxlsxwriter/distinfo
index 54b0fdb002..6dc1f5a3d9 100644
--- a/libxlsxwriter/distinfo
+++ b/libxlsxwriter/distinfo
@@ -5,3 +5,4 @@ RMD160 (libxlsxwriter-0.8.4.tar.gz) = b3153e947cc9736e2fb5be053c660940fcc31449
 SHA512 (libxlsxwriter-0.8.4.tar.gz) = b4de99605c9f3b8d7038e7ac49979bdb1998016e04e474008a4f086f5f42e072ab977a70f408b0a348f1ae1ce999a3d9d415961288797ab6ae56d84767f2c5c4
 Size (libxlsxwriter-0.8.4.tar.gz) = 13981205 bytes
 SHA1 (patch-Makefile) = 649fdb200580d1344adf49a3a7519eaba4830d07
+SHA1 (patch-src_Makefile) = a5aa5333c311d594d244385c04fdd0d2c08133a8
diff --git a/libxlsxwriter/patches/patch-src_Makefile b/libxlsxwriter/patches/patch-src_Makefile
new file mode 100644
index 0000000000..bdefc37b8b
--- /dev/null
+++ b/libxlsxwriter/patches/patch-src_Makefile
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+Fix hardcoded prefix for macOS build.
+
+Upstream PR:
+https://github.com/jmcnamara/libxlsxwriter/pull/210
+
+--- src/Makefile
++++ src/Makefile
+@@ -82,7 +82,7 @@ UNAME := $(shell uname)
+ # Change make options on OS X.
+ ifeq ($(UNAME), Darwin)
+ LIBXLSXWRITER_SO = libxlsxwriter.dylib
+-SOFLAGS = -dynamiclib $(FPIC) -install_name /usr/lib/$(LIBXLSXWRITER_SO)
++SOFLAGS = -dynamiclib $(FPIC) -install_name $(PREFIX)/lib/$(LIBXLSXWRITER_SO)
+ endif
+ 
+ # Check for MinGW/MinGW64/Cygwin environments.


Home | Main Index | Thread Index | Old Index