Forum: GNU Radio [PATCH] cross build: undo bad side effect of commit dee85a7f4932c2475d9e84c5f92c2f3220aed3e6

5b494ac14b6ea73c79b0b19c76f37dfd?d=identicon&s=25 Andy Walls (Guest)
on 2014-04-25 16:48
(Received via mailing list)
The use of VERBATIM in commit dee85a7f4932c2475d9e84c5f92c2f3220aed3e6
affected the expansion of ${pyexe_native} for cross builds:

  #!/usr/bin/env;python

is not the same as

  #!/usr/bin/env python

Signed-off-by: Andy Walls <andy@silverblocksystems.net>

--

diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake
index ed7f05c..395faff 100644
--- a/cmake/Modules/GrPython.cmake
+++ b/cmake/Modules/GrPython.cmake
@@ -192,7 +192,7 @@ function(GR_PYTHON_INSTALL)
         file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native)

         if (CMAKE_CROSSCOMPILING)
-           set(pyexe_native /usr/bin/env python)
+           set(pyexe_native "/usr/bin/env python")
         endif()

         foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS})
diff --git a/volk/cmake/GrPython.cmake b/volk/cmake/GrPython.cmake
index f2adc31..b7b561b 100644
--- a/volk/cmake/GrPython.cmake
+++ b/volk/cmake/GrPython.cmake
@@ -184,7 +184,7 @@ function(VOLK_PYTHON_INSTALL)
         file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native)

         if (CMAKE_CROSSCOMPILING)
-           set(pyexe_native /usr/bin/env python)
+           set(pyexe_native "/usr/bin/env python")
         endif()

         foreach(pyfile ${VOLK_PYTHON_INSTALL_PROGRAMS})
C539637020fd56193dd6daec746c4a84?d=identicon&s=25 Tom Rondeau (Guest)
on 2014-04-25 17:39
(Received via mailing list)
On Fri, Apr 25, 2014 at 10:47 AM, Andy Walls
<andy@silverblocksystems.net>wrote:

>
> -           set(pyexe_native /usr/bin/env python)
>
>          if (CMAKE_CROSSCOMPILING)
> -           set(pyexe_native /usr/bin/env python)
> +           set(pyexe_native "/usr/bin/env python")
>          endif()
>
>          foreach(pyfile ${VOLK_PYTHON_INSTALL_PROGRAMS})
>

Thanks, Andy. In the future, can you either open an Issue on
gnuradio.orgor send us a pull request through github? That helps us
track these things
and makes sure they don't get lost. This at least is easy enough, plus
Philip bugged me about it and I was just about to push some updates,
anyways, so this will show up shortly.

Thanks,
Tom
5b494ac14b6ea73c79b0b19c76f37dfd?d=identicon&s=25 Andy Walls (Guest)
on 2014-04-25 17:46
(Received via mailing list)
On Fri, 2014-04-25 at 11:38 -0400, Tom Rondeau wrote:
> On Fri, Apr 25, 2014 at 10:47 AM, Andy Walls
>
> Thanks, Andy. In the future, can you either open an Issue on
> gnuradio.org or send us a pull request through github? That helps us
> track these things and makes sure they don't get lost.

Sure.  "Issue on gnuradio.org" is what I'll do in the future.


>  This at least is easy enough, plus Philip bugged me about it and I
> was just about to push some updates, anyways, so this will show up
> shortly.

Thanks!

Regards,
Andy
This topic is locked and can not be replied to.