diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-21 07:08:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-25 05:29:18 +0530 |
| commit | fbaf3bc4ae8c6253f560d3da2ab4dee746cfcb09 (patch) | |
| tree | 07005a072389b399b4031b2a441a3b76f3fbb5ef /recipes/libsrtp.recipe | |
| parent | 151e8c47edf2df402bd46eb66f50ff690d54905c (diff) | |
cerbero/build: Workaround MSYS trying to be too smart
Finally figured out the actual issue that I was trying to solve in
f38df32d8 and 78f06dd405. Paths like `c:/foobar` (lowercase drive
letter) are considered to be a POSIX path list, so `c:/foobar/`
becomes `c;C:\foobar`:
http://mingw.org/wiki/Posix_path_conversion
This will happen anytime we try to pass a path as a command-line
argument. We used to work-around this by using `to_unixpath()`,
but that's just sinking deeper into dependence on broken shell
behaviour. This happens now because we're passing includes in CFLAGS,
CXXFLAGS, CPPFLAGS, etc.
So let's just bypass the shell entirely by constructing a list. As
a side-effect, this is another step towards being able to run Cerbero
from a directory with spaces in it.
For now, we'll convert `config_sh` to a list when not using an
Autotools configure. Luckily, we don't need to pass any paths as
arguments to it anyway. When running other stages, we now always use
a list instead of a string. Hopefully the fallout is small and obvious
for people using forks of Cerbero.
Diffstat (limited to 'recipes/libsrtp.recipe')
| -rw-r--r-- | recipes/libsrtp.recipe | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/libsrtp.recipe b/recipes/libsrtp.recipe index 540425f4..45b9be33 100644 --- a/recipes/libsrtp.recipe +++ b/recipes/libsrtp.recipe @@ -8,6 +8,7 @@ class Recipe(recipe.Recipe): name = 'libsrtp' version = '2.2.0' stype = SourceType.TARBALL + make = ['make', 'all', 'shared_library'] url = 'https://github.com/cisco/%(name)s/archive/v%(version)s.tar.gz' tarball_checksum = '44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b' licenses = [{License.BSD_like: ['LICENSE']}] @@ -19,7 +20,6 @@ class Recipe(recipe.Recipe): def prepare(self): # Don't accidentially build with pcap support self.set_env('ac_cv_lib_pcap_pcap_create', 'no') - self.make += ' all shared_library' async def install(self): await super(Recipe, self).install() |