discuss-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Discuss-gnuradio] [PATCH] cross build: undo bad side effect of comm


From: Tom Rondeau
Subject: Re: [Discuss-gnuradio] [PATCH] cross build: undo bad side effect of commit dee85a7f4932c2475d9e84c5f92c2f3220aed3e6
Date: Fri, 25 Apr 2014 11:38:18 -0400

On Fri, Apr 25, 2014 at 10:47 AM, Andy Walls <address@hidden> wrote:
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 <address@hidden>

--

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})

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. 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
 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]