pkgsrc-WIP-changes archive

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

halfempty: fix build on NetBSD.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Jan 9 13:11:35 2020 +0100
Changeset:	67c8679aac6ff3698308cc18323372c6c73fe76a

Modified Files:
	halfempty/distinfo
Added Files:
	halfempty/patches/patch-Makefile
Removed Files:
	halfempty/TODO

Log Message:
halfempty: fix build on NetBSD.

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

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

diffstat:
 halfempty/TODO                   |  8 --------
 halfempty/distinfo               |  1 +
 halfempty/patches/patch-Makefile | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diffs:
diff --git a/halfempty/TODO b/halfempty/TODO
deleted file mode 100644
index 4ed28bd5e8..0000000000
--- a/halfempty/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-Uses Linux-specific functions:
-
-ld: proc.o: in function `write_pipe':
-/scratch/wip/halfempty/work/halfempty-0.30/proc.c:93: undefined reference to `splice'
-ld: util.o: in function `g_sendfile':
-/scratch/wip/halfempty/work/halfempty-0.30/util.c:175: undefined reference to `sendfile'
-
-https://github.com/googleprojectzero/halfempty/issues/12
diff --git a/halfempty/distinfo b/halfempty/distinfo
index e78dd180b6..6738d19b4e 100644
--- a/halfempty/distinfo
+++ b/halfempty/distinfo
@@ -4,6 +4,7 @@ SHA1 (halfempty-0.30.tar.gz) = 488244faa408bb33331a30a0e482ad46d0968c85
 RMD160 (halfempty-0.30.tar.gz) = e4f3b6840c973a116dc066b6bdc7040d848ff39e
 SHA512 (halfempty-0.30.tar.gz) = 99a78723fd70f06f6059379062cb700e4f571ef476e48b5fa61a3afa2d2290536ad287cee8a62441d4528cb4849755daa36aef9989239bdb59510e562dc0bedd
 Size (halfempty-0.30.tar.gz) = 1097760 bytes
+SHA1 (patch-Makefile) = 7a49f55b08b8e4bb583f21c10c42bc5d49202c36
 SHA1 (patch-bisect.c) = e78d35cb18ec1d59eff66ee31afac3f42753cdd5
 SHA1 (patch-limits.c) = 3999440235ddff9b2d48b5f639d1fd22cb37f698
 SHA1 (patch-proc.c) = 638b8b9b7c0f74b004cf19a40ef7acea1ca9be66
diff --git a/halfempty/patches/patch-Makefile b/halfempty/patches/patch-Makefile
new file mode 100644
index 0000000000..ca907d2fdf
--- /dev/null
+++ b/halfempty/patches/patch-Makefile
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Use generic replacement functions for missing symbols on NetBSD.
+https://github.com/googleprojectzero/halfempty/pull/11
+
+--- Makefile.orig	2019-03-16 17:55:00.000000000 +0000
++++ Makefile
+@@ -23,6 +23,10 @@ ifeq ($(findstring Microsoft,$(shell una
+     EXTRA = splice_generic.o sendfile_generic.o
+ endif
+ 
++ifeq ($(shell uname),NetBSD)
++    EXTRA = sendfile_generic.o splice_generic.o
++endif
++
+ halfempty: proc.o bisect.o util.o zero.o tree.o flags.o halfempty.o limits.o $(EXTRA)
+ 
+ util.o: monitor.h util.c


Home | Main Index | Thread Index | Old Index