ldconfig exec only on target.
authorRonan Le Martret <ronan@fridu.net>
Tue, 8 Jul 2014 12:59:24 +0000 (14:59 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 8 Jul 2014 12:59:24 +0000 (14:59 +0200)
Change-Id: I0b2259b85b2ff8c0b57b4cd4b879059a83954658
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
tools/spec2yocto.py

index 532c009..5aaf522 100644 (file)
@@ -21,8 +21,9 @@
         %{?_cmake_lib_suffix64} \\\
 %endif \
         %{?_cmake_skip_rpath} \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON
-
+        -DBUILD_SHARED_LIBS:BOOL=ON \\\
+        \${EXTRA_OECMAKE} 
+         
 #        tmp remove toolchain
 #        \\\
 #        -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake
index d855b80..8436aef 100755 (executable)
@@ -1639,6 +1639,7 @@ class MetaSpec:
     def __create_compile( self ,file_d):
         code=self.__spec_parser.get_build_section()
         code=code.replace("\n","\n ")
+        
         file_d.write( "do_compile() {\n" )
         file_d.write( " %s\n" % code )
         file_d.write( "}\n" )
@@ -1673,7 +1674,7 @@ class MetaSpec:
         '''
         Writes the pre/post (un)install sections of the recipe.
         '''
-        code=code.replace("/sbin/ldconfig","ldconfig")
+        code=code.replace("/sbin/ldconfig","[ \"x\$D\" != \"x\" ] && ldconfig")
         code=code.replace("${prefix}","$D${prefix}")