diff:选项无法识别«--git»

时间:2016-05-14 15:22:59

标签: git python-2.7 cryptography diff ubuntu-16.04

当我尝试为python脚本安装依赖项时,我收到此错误:

build/temp.linux-x86_64-2.7/_openssl.c:697:6: error: conflicting types for ‘BIO_new_mem_buf’
 BIO *BIO_new_mem_buf(void *, int);
      ^
In file included from /usr/include/openssl/asn1.h:65:0,
                 from build/temp.linux-x86_64-2.7/_openssl.c:413:
/usr/include/openssl/bio.h:692:6: note: previous declaration of ‘BIO_new_mem_buf’ was here
 BIO *BIO_new_mem_buf(const void *buf, int len);
      ^
error: command 'x86_64-linux-gnu-gcc' failed with exit status 1

我尝试找到此补丁here

diff --git a/dev-python/cryptography/cryptography-1.2.2.ebuild b/dev-python/cryptography/cryptography-1.2.2.ebuild

然后我收到此错误diff: option not recognize «--git»

如何解决此错误?

1 个答案:

答案 0 :(得分:3)

diff --git不是命令,而是header of a git diff -p(补丁):

  

-p选项产生的内容与传统的diff格式略有不同:

     

前面有一个“git diff”标题,如下所示:

diff --git a/file1 b/file2

由于gentoo仓库中的diffstat处于统一模式,您可以将其复制到补丁文件中,apply it to your codebase复制patch command。 (见more examples here)。

patch foo.c < patch.diff