pkgsrc-WIP-changes archive

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

bitkeeper: Add patch from Wayne Scott to get build to progress further.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jun 8 16:47:59 2016 +0200
Changeset:	faf4eb01cf3e543733f495eaaa19b5a6ae3b89fa

Modified Files:
	bitkeeper/distinfo
Added Files:
	bitkeeper/patches/patch-src_libc_utils_crc32c.c

Log Message:
bitkeeper: Add patch from Wayne Scott to get build to progress further.

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

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

diffstat:
 bitkeeper/distinfo                              |  1 +
 bitkeeper/patches/patch-src_libc_utils_crc32c.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diffs:
diff --git a/bitkeeper/distinfo b/bitkeeper/distinfo
index 826e735..5d3744c 100644
--- a/bitkeeper/distinfo
+++ b/bitkeeper/distinfo
@@ -5,3 +5,4 @@ RMD160 (bk-7.2.1.tar.gz) = 00046627f2fb02c9e017a469f2f7917abda0b2e9
 SHA512 (bk-7.2.1.tar.gz) = c07ae760f70e0715f20e667207385a10124fe4e577b85f3a930ae845fb4aee94946bdc7713d1c71fff06f5c166ba7e318f7f0137de6732ebe2c207274f617e50
 Size (bk-7.2.1.tar.gz) = 28958626 bytes
 SHA1 (patch-src_gui_tcltk_tcl_win_configure) = 909c7c4092a198efa0f8edcc21a7d33023e25860
+SHA1 (patch-src_libc_utils_crc32c.c) = f5be9e423aade86282b3e596f5035381b50fac8c
diff --git a/bitkeeper/patches/patch-src_libc_utils_crc32c.c b/bitkeeper/patches/patch-src_libc_utils_crc32c.c
new file mode 100644
index 0000000..f6eedca
--- /dev/null
+++ b/bitkeeper/patches/patch-src_libc_utils_crc32c.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build on NetBSD/amd64. From Wayne Scott.
+
+--- src/libc/utils/crc32c.c.orig	2016-05-16 18:52:05.000000000 +0000
++++ src/libc/utils/crc32c.c
+@@ -1247,7 +1247,7 @@ cpuid(u32 functionInput)
+ 	u32 ebx;
+ 	u32 ecx;
+ 	u32 edx;
+-#ifdef __PIC__
++#if defined(__PIC__) && !defined(__x86_64__)
+ 	// PIC: Need to save and restore ebx See:
+ 	// http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
+ 	asm("pushl %%ebx\n\t" /* save %ebx */


Home | Main Index | Thread Index | Old Index