forked from enlightenment/efl
changes to correct build in Tizen platform
This commit is contained in:
parent
5167399c16
commit
a44f3c0818
13
.gbs.conf
13
.gbs.conf
|
@ -1,3 +1,16 @@
|
|||
[general]
|
||||
upstream_branch = upstream
|
||||
upstream_tag = v${upstreamversion}
|
||||
|
||||
tmpdir=/var/tmp/
|
||||
profile = profile.tizen3.0_common
|
||||
work_dir=.
|
||||
|
||||
[repo.tizen3]
|
||||
url=http://download.tizen.org/releases/milestone/tizen/common-3.0.2015.Q1/tizen-3.0.2015.Q1-common_20150331.1/repos/x86_64-wayland/packages/
|
||||
#url=http://download.tizen.org/snapshots/tizen/common/latest/repos/x86_64-wayland/packages/
|
||||
|
||||
[profile.tizen3.0_common]
|
||||
repos=repo.tizen3
|
||||
#buildconf=${work_dir}/scm/meta/build-config/build.conf
|
||||
|
||||
|
|
|
@ -904,6 +904,7 @@ grep --silent ECORE_IMF_MODULE "$f" \
|
|||
%manifest %{name}.manifest
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/eio-1/*
|
||||
%{_includedir}/eio-cxx-1/*
|
||||
%{_libdir}/libeio.so
|
||||
%{_libdir}/pkgconfig/eio*.pc
|
||||
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: emodel C++ API
|
||||
Description: MVC Library C++ API.
|
||||
Version: @PACKAGE_VERSION@
|
||||
Requires.private: @requirements_pc_emodel@
|
||||
Libs: -L${libdir} -lemodel
|
||||
Libs.private: @requirements_libs_emodel@
|
||||
Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/emodel-@VMAJ@ -I${includedir}/emodel-cxx-@VMAJ@
|
|
@ -1,12 +0,0 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: emodel
|
||||
Description: MVC Library
|
||||
Version: @PACKAGE_VERSION@
|
||||
Requires.private: @requirements_pc_emodel@
|
||||
Libs: -L${libdir} -lemodel
|
||||
Libs.private: @requirements_libs_emodel@
|
||||
Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/emodel-@VMAJ@
|
|
@ -60,7 +60,7 @@ build() {
|
|||
package_efl() {
|
||||
provides+=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver"
|
||||
"eet=$pkgver" "eeze=$pkgver" "efreet=$pkgver"
|
||||
"eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver" "emodel=$pkgver"
|
||||
"eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver"
|
||||
"ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver")
|
||||
conflicts+=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
|
||||
'ethumb' 'evas')
|
||||
|
|
|
@ -39,7 +39,8 @@ lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
|
|||
installed_eflheadersdir = $(includedir)/efl-@VMAJ@
|
||||
dist_installed_eflheaders_DATA = \
|
||||
lib/efl/Efl_Config.h \
|
||||
lib/efl/Efl.h
|
||||
lib/efl/Efl.h \
|
||||
lib/efl/Efl_Model_Common.h
|
||||
|
||||
installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
|
||||
nodist_installed_eflinterfaces_DATA = $(efl_eolian_files_h)
|
||||
|
|
|
@ -2,13 +2,7 @@ if HAVE_CXX11
|
|||
|
||||
### Generated headers
|
||||
|
||||
generated_efl_cxx_bindings = \
|
||||
lib/efl/interfaces/efl_control.eo.hh \
|
||||
lib/efl/interfaces/efl_file.eo.hh \
|
||||
lib/efl/interfaces/efl_image.eo.hh \
|
||||
lib/efl/interfaces/efl_player.eo.hh \
|
||||
lib/efl/interfaces/efl_text.eo.hh \
|
||||
lib/efl/interfaces/efl_text_properties.eo.hh
|
||||
generated_efl_cxx_bindings = $(efl_eolian_files:%.eo=%.eo.hh)
|
||||
|
||||
lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
|
||||
@echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
|
||||
|
|
|
@ -46,9 +46,6 @@ lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@ @EFL_CFL
|
|||
lib_eio_libeio_la_LIBADD = @EIO_LIBS@ @EFL_LIBS@
|
||||
lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
|
||||
lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
|
||||
if HAVE_NOTIFY_COCOA
|
||||
lib_eio_libeio_la_LDFLAGS += -framework CoreServices
|
||||
endif
|
||||
|
||||
if EFL_ENABLE_TESTS
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ type_lookup_table
|
|||
{"Eina_List *", eolian_type::complex_, false, true, true, "::efl::eina::list", {"eina-cxx/eina_list.hh"}},
|
||||
{"const Eina_List *", eolian_type::complex_, true, false, true, "::efl::eina::crange_list", {"eina-cxx/eina_list.hh"}},
|
||||
{"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}},
|
||||
{"Emodel *", eolian_type::simple_, false, false, true, "::emodel", {"Emodel.hh"}},
|
||||
{"Efl_Model_Base *", eolian_type::simple_, false, false, true, "::efl::model::base", {"Efl.hh"}},
|
||||
{"Eo *", eolian_type::simple_, false, true, true, "::efl::eo::concrete", {"eo_concrete.hh"}},
|
||||
{"Eo *", eolian_type::simple_, false, false, true, "::efl::eo::concrete", {"eo_concrete.hh"}},
|
||||
//{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}},
|
||||
|
|
|
@ -20,7 +20,6 @@ eio_file_copy
|
|||
eio_file_ls_SOURCES = eio_file_ls.c
|
||||
eio_file_ls_LDADD = \
|
||||
$(top_builddir)/src/lib/eio/libeio.la \
|
||||
$(top_builddir)/src/lib/emodel/libemodel.la \
|
||||
$(top_builddir)/src/lib/eo/libeo.la \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
$(top_builddir)/src/lib/eet/libeet.la \
|
||||
|
@ -30,7 +29,6 @@ $(top_builddir)/src/lib/eina/libeina.la \
|
|||
eio_file_copy_SOURCES = eio_file_copy.c
|
||||
eio_file_copy_LDADD = \
|
||||
$(top_builddir)/src/lib/eio/libeio.la \
|
||||
$(top_builddir)/src/lib/emodel/libemodel.la \
|
||||
$(top_builddir)/src/lib/eo/libeo.la \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
$(top_builddir)/src/lib/eet/libeet.la \
|
||||
|
|
Loading…
Reference in New Issue