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

pyqwt5: no longer attempting to install sip modules in /usr/share #32

Merged
merged 1 commit into from Jun 10, 2016

Conversation

estatz
Copy link
Contributor

@estatz estatz commented Jun 3, 2016

commit 4bf4e23 eliminated configure time dependency on the "reprefix"
environment variable, but did so in such a way that sip modulues are
installed under /usr/share instead of $PYBOMBS_PREFIX/share. This
behavior is unintended and causes an error when pybombs is executed
by a non-root user.

This commit makes the following changes:

  • mirrors the "reprefix" fix applied to the qwt5 recipe in a38e3a5
  • fixes whitespace and formatting jank introduced by the
    convert_1to2.py conversion
  • changed python module directory for sed and for installation
    from "python2.6" to "python2.7". This should be safe since
    pybombs now requires python 2.7 to run

This resolves a CentOS 7 installation issue

commit 4bf4e23 eliminated configure time dependency on the "reprefix"
environment variable, but did so in such a way that sip modulues are
installed under /usr/share instead of $PYBOMBS_PREFIX/share.  This
behavior is unintended and causes an error when pybombs is executed
by a non-root user.

This commit makes the following changes:
 * mirrors the "reprefix" fix applied to the qwt5 recipe in a38e3a5
 * fixes whitespace and formatting jank introduced by the
   convert_1to2.py conversion
 * changed python module directory for sed and for installation
   from "python2.6" to "python2.7".  This _should_ be safe since
   pybombs now requires python 2.7 to run
@mbr0wn
Copy link
Member

mbr0wn commented Jun 3, 2016

@estatz It seems that the value of $reprefix would always point to the same value as $prefix. So why introduce it?

@estatz
Copy link
Contributor Author

estatz commented Jun 3, 2016

This is the same issue as #20 where we need a version of the $prefix string with escape characters. I'm not entirely sure how sed was interpreting the non-escaped $prefix string, but the end result was that make install was attempting to install things in /usr/local

@mbr0wn mbr0wn merged commit 2cbda2a into gnuradio:master Jun 10, 2016
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

2 participants