From: Ronan Le Martret Date: Fri, 30 Aug 2013 13:47:46 +0000 (+0200) Subject: - add cmake rpm macro. X-Git-Tag: rev_0.4~254 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13319efcce8f366a3e91878b266cd979adfc8dc0;p=scm%2Fbb%2Ftizen.git - add cmake rpm macro. --- diff --git a/conf/bblayers.conf b/conf/bblayers.conf deleted file mode 100644 index 05e550a..0000000 --- a/conf/bblayers.conf +++ /dev/null @@ -1,16 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "5" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - /home/ronanguirec/Documents/yocto/openembedded-core-gen-tizen2/meta \ - /home/ronanguirec/Documents/yocto/openembedded-core-gen-tizen2/meta-tizen \ - " - -BBLAYERS_NON_REMOVABLE ?= " \ - /home/ronanguirec/Documents/yocto/openembedded-core-gen-tizen2/meta \ - " - diff --git a/conf/local.conf b/conf/local.conf deleted file mode 100644 index 26bd06d..0000000 --- a/conf/local.conf +++ /dev/null @@ -1,237 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. -#DISTRO_FEATURES += "systemd" - - - -PREFERRED_PROVIDER_coreutils = "tizen-coreutils" -PREFERRED_PROVIDER_python-xml = "python-base" -PREFERRED_PROVIDER_libpcre = "pcre" -PREFERRED_VERSION_elfutils = "git" -PREFERRED_VERSION_python = "git" - -DISTRO_FEATURES += "systemd" - -### DISTRO_FEATURES += "systemd" -# -# Parallelism Options -# -# These two options control how much parallelism BitBake should use. The first -# option determines how many tasks bitbake should run in parallel: -# -BB_NUMBER_THREADS = "16" -# -# The second option controls how many processes make should run in parallel when -# running compile tasks: -# -PARALLEL_MAKE = "-j 16" -# -# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would -# be appropriate for example. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemux86" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" -DL_DIR ?= "/home/ronanguirec/yoctoTizen_IVI/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" -SSTATE_DIR ?= "/home/ronanguirec/yoctoTizen_IVI/sstate-cache" -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to ipk: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK/ADT target architecture -# -# This variable specified the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host._ -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line -#IMAGETEST = "qemu" -# -# This variable controls which tests are run against virtual images if enabled -# above. The following would enable bat, boot the test case under the sanity suite -# and perform toolchain tests -#TEST_SCEN = "sanity bat sanity:boot toolchain" -# -# Because of the QEMU booting slowness issue (see bug #646 and #618), the -# autobuilder may suffer a timeout issue when running sanity tests. We introduce -# the variable TEST_SERIALIZE here to reduce the time taken by the sanity tests. -# It is set to 1 by default, which will boot the image and run cases in the same -# image without rebooting or killing the machine instance. If it is set to 0, the -# image will be copied and tested for each case, which will take longer but be -# more precise. -#TEST_SERIALIZE = "1" - -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" diff --git a/meta-tizen-ivi/classes/tizen_cmake.bbclass b/meta-tizen-ivi/classes/tizen_cmake.bbclass index 9b9537b..5fd7ae1 100644 --- a/meta-tizen-ivi/classes/tizen_cmake.bbclass +++ b/meta-tizen-ivi/classes/tizen_cmake.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "cmake-native " +DEPENDS_prepend = " cmake-native " # We need to unset CCACHE otherwise cmake gets too confused CCACHE = "" diff --git a/meta-wrt-tizen/recipes-wrt/com-core/com-core-extraconf.inc b/meta-wrt-tizen/recipes-wrt/com-core/com-core-extraconf.inc index e69de29..17ea556 100644 --- a/meta-wrt-tizen/recipes-wrt/com-core/com-core-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/com-core/com-core-extraconf.inc @@ -0,0 +1 @@ +inherit tizen_cmake \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/common/common-extraconf.inc b/meta-wrt-tizen/recipes-wrt/common/common-extraconf.inc index e69de29..17ea556 100644 --- a/meta-wrt-tizen/recipes-wrt/common/common-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/common/common-extraconf.inc @@ -0,0 +1 @@ +inherit tizen_cmake \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/dlog/dlog-extraconf.inc b/meta-wrt-tizen/recipes-wrt/dlog/dlog-extraconf.inc index e69de29..ec6bfc7 100644 --- a/meta-wrt-tizen/recipes-wrt/dlog/dlog-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/dlog/dlog-extraconf.inc @@ -0,0 +1,8 @@ +SRC_URI += "\ + file://configure.ac.patch \ + " + +do_patch_append () { + echo RLM begining of python do_patch + cat ${WORKDIR}/configure.ac.patch | patch -s -p1 --fuzz=2 +} \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/dlog/dlog/configure.ac.patch b/meta-wrt-tizen/recipes-wrt/dlog/dlog/configure.ac.patch new file mode 100644 index 0000000..0891b9d --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/dlog/dlog/configure.ac.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index c5af179..0ca6084 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,10 @@ AC_PROG_CC + AC_PROG_GCC_TRADITIONAL + AC_PROG_LIBTOOL + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + # checks arch + AM_CONDITIONAL(DEVELOP_VER, test $DEVELOP_VER = yes) + diff --git a/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.cmake b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.cmake new file mode 100644 index 0000000..b0c1b09 --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.cmake @@ -0,0 +1,24 @@ +# +# Macros for cmake +# +%_cmake_lib_suffix64 -DLIB_SUFFIX=64 +%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON +%__cmake cmake + +%cmake \ + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ + %__cmake \\\ + -DCMAKE_VERBOSE_MAKEFILE=ON \\\ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ + %{?_cmake_skip_rpath} \\\ + -DBUILD_SHARED_LIBS:BOOL=ON