diff:选项没办法识别和amp;amp;#171;-git和amp;amp;#187;
it1352
帮助1人
问题说明
当我尝试为python脚本安装依赖程序时，出现此错误:
When I'm trying to install depencies for a python script I get this error:
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
我尝试在此处:
diff --git a/dev-python/cryptography/cryptography-1.2.2.ebuild b/dev-python/cryptography/cryptography-1.2.2.ebuild
但是然后我得到这个错误 diff:选项无法识别«--git»
But then I get this error diff: option not recognize «--git»
如何解决此错误?
正确答案
#1
diff --git 不是命令，而是
It is preceded with a "git diff" header that looks like this:
diff --git a/file1 b/file2
由于gentoo存储库中的diffstat处于统一模式，因此您可以将其复制到补丁文件中，然后 补丁命令.
(请参见此处更多示例).
Since the diffstat in the gentoo repo is in unified mode, you can copy it in a patch file, and apply it to your codebase with a patch command.
(See more examples here).
patch foo.c < patch.diff
这篇好文章是转载于：学新通技术网
