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

fix: #14 to support some arch linux #15

Merged
merged 1 commit into from
Mar 29, 2022
Merged

fix: #14 to support some arch linux #15

merged 1 commit into from
Mar 29, 2022

Conversation

yihong0618
Copy link
Contributor

@yihong0618 yihong0618 commented Mar 29, 2022

fix: #14 by changing the root dir.

Copy link
Member

@cfc4n cfc4n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as codeview comment. please reupdate, and keep one git commit with git reset --soft command. thanks.

if e != nil {
prefix = OTHERS_BINARY_PREFIX
}
this.Openssl = prefix "/libssl.so.1.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use filepath.Join() to concatenate strings.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

of course, I prefer to use git rebase -i HEAD~3 could I do it that way ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, try it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

switch this.conf.(*GnutlsConfig).elfType {
case ELF_TYPE_BIN:
binaryPath = this.conf.(*GnutlsConfig).Curlpath
case ELF_TYPE_SO:
binaryPath = this.conf.(*GnutlsConfig).Gnutls
default:
//如果没找到
binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30"
binaryPath = prefix "/libgnutls.so.30"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep origin value due binaryPath is certain from config_* struct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep origin value due binaryPath is certain from config_* struct.

Sorry I missed to understand this comment, why the logic should change here?

@yihong0618 yihong0618 requested a review from cfc4n March 29, 2022 11:44
switch this.conf.(*GnutlsConfig).elfType {
case ELF_TYPE_BIN:
binaryPath = this.conf.(*GnutlsConfig).Curlpath
case ELF_TYPE_SO:
binaryPath = this.conf.(*GnutlsConfig).Gnutls
default:
//如果没找到
binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30"
binaryPath = filepath.Join(prefix, "libgnutls.so.30")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rollback this code block. search .so path must be finished by config_ . probe_module do not choose so_ ,just use a default value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it. THX

@yihong0618
Copy link
Contributor Author

Rollback and fixed

@cfc4n cfc4n merged commit 6b1d465 into gojue:master Mar 29, 2022
@cfc4n
Copy link
Member

cfc4n commented Mar 29, 2022

LGTM, thanks.

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.

Arch linux maybe in .so file maybe in different directory
2 participants