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

Escape square brackets in configure.ac #2618

Merged
merged 1 commit into from Jan 9, 2019
Merged

Conversation

0mp
Copy link
Contributor

@0mp 0mp commented Jan 9, 2019

This patch attempts to solve the regression introduced in e8b0efd
(#2607).

It wasn't detected by me before the previous commit because GNU grep behaviour for egrep '^_[:alpha:]_[:alnum:]*$' varies across versions:

  • grep (GNU grep) 2.5.1-FreeBSD does not report any issues

  • grep (GNU grep) 3.3 prints the following message:

    /bin/grep: character class syntax is [[:space:]], not [:space:]
    

This patch attempts to solve the regression introduced in e8b0efd
(NixOS#2607).
@edolstra edolstra merged commit 9a74326 into NixOS:master Jan 9, 2019
@0mp 0mp deleted the fix-configure.ac branch January 9, 2019 15:56
@kirelagin
Copy link
Member

Now it gets turned into '^[_[[:alpha:]]][_[[:alnum:]]]*$', which still doesn’t look right. Looks like the inner pair of brackets does not need to be escaped.

@kirelagin
Copy link
Member

I think, you also could redirect the output of the if condition to /dev/null so that it doesn’t spam the terminal with variable names.

@kirelagin
Copy link
Member

kirelagin commented Jan 9, 2019

Also, I am getting

./configure: line 8551: 2.2: command not found

a number of times, which, I think, come from lines similar to this one in config.status:

S["PACKAGE_STRING"]="nix 2.2"

and missing quotes in the eval line.


There is also a number of lines of the form

./configure: line 8551: -lsodium: command not found

@kirelagin
Copy link
Member

I’ve got another regression. It looks a lot like it was introduced by the same commit.

src/libstore/s3-binary-cache-store.cc:95:23: error: invalid token at start of a preprocessor expression
#if AWS_VERSION_MAJOR == 1 && AWS_VERSION_MINOR < 3

in config.status:

D["AWS_VERSION_MAJOR"]=" "
D["AWS_VERSION_MINOR"]=" "

@edolstra
Copy link
Member

I've reverted this and the previous commit for now.

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.

None yet

3 participants