Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update abseil to 20230802.1 #2884

Merged
merged 20 commits into from
Dec 15, 2023
Merged

update abseil to 20230802.1 #2884

merged 20 commits into from
Dec 15, 2023

Conversation

heheda123123
Copy link
Contributor

No description provided.

@heheda123123
Copy link
Contributor Author

heheda123123 commented Dec 4, 2023

20230802.1 这个版本需要打patch
conan-io/conan-center-index#21012

@heheda123123
Copy link
Contributor Author

为啥patch corrupt了?没看懂,不是和conan的一样吗?
image

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


And it’s really annoying to have this git autocrlf, you have to cut the patch into lf, calculate the hash, and then cut it back. . .

@waruqi
Copy link
Member

waruqi commented Dec 13, 2023

为啥patch corrupt了?没看懂,不是和conan的一样吗?

人家的 patch 不一定格式兼容,这边是用 git apply 的,那应该用 git diff 去生成 patch。。conan 可能用的 patch 命令生成的,格式有差异。

你可以先本地合入补丁后,走 git diff 再输出个新补丁

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


Why is the patch corrupt? I don’t understand. Isn’t it the same as Conan’s?

Other people's patches may not necessarily have compatible formats. Here we use git apply, so we should use git diff to generate patches. . conan may be generated using the patch command, and the format is different.

You can merge the patch locally first, run git diff and then output a new patch.

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


Why is the patch corrupt? I don’t understand. Isn’t it the same as Conan’s?

Other people’s patches may not necessarily have compatible formats. Here we use git apply, so we should use git diff to generate the patch. . conan may be generated using the patch command, and the format is different.

You can merge the patch locally first, run git diff and then output a new patch.

I haven’t used patches much, I thought they were all in the same format.

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


Still not working, the operation process
1 wget source code, create a git repository, add, commit
2 patch -p1 < ../xx.patch
3 add, commit,
4 Then git diff twice submitted commit > xx.patch

@heheda123123
Copy link
Contributor Author

没问题了

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


No problem

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


I don’t know why I specified add_links before.
Actual measurement will cause errors in the re2 library. Only 69 libraries were specified before. If not specified, there would be 85 libraries.

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


There is a question, if

@heheda123123 heheda123123 reopened this Dec 15, 2023
@heheda123123
Copy link
Contributor Author

abseil这个链接顺序好坑,这里调整之后,字符串示例没问题,估计后面实际使用其他模块的时候还会有问题,需要使用者自己设置链接顺序

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


The link order of abseil is a problem. After adjusting here, the string example is fine. It is estimated that there will be problems when other modules are actually used later. Users need to set the link order themselves.

@heheda123123
Copy link
Contributor Author

heheda123123 commented Dec 15, 2023

提一嘴,为什么删掉原来的add_links列表,因为abseil迭代很快,到20230802.1这个版本之后,库名变化很多,特别是internal的。而且还新增了三十几个库
想在这里手动把所有库的链接顺序写清楚太费事了。八十几个库。。。

@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


Just to mention, why did you delete the original add_links list? Because abseil iterates very quickly. After version 20230802.1, the library name has changed a lot, especially internal. And more than thirty new libraries have been added

@waruqi waruqi merged commit 2e7c8e1 into xmake-io:dev Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants