From a87c8432f6cdf5eec93117eaf9fe1c980046b76e Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 20 Aug 2014 08:37:26 -0700 Subject: [PATCH] Revert pc file & spec changes Reverting due to ensure matching weekly release across all repos. Will be pushed later. This reverts commit f85a9b4bc73ea297646152c134a6ae340634fcbb. Change-Id: Ie6795a9e2a44a5dadf7ac616fe582053a0b1103e --- build/tizen/dali-application.pc.in | 2 +- build/tizen/dali.pc.in | 2 +- packaging/dali-adaptor-mobile.spec | 4 ++-- packaging/dali-adaptor-wearable.spec | 4 ++-- packaging/dali-adaptor.spec | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/tizen/dali-application.pc.in b/build/tizen/dali-application.pc.in index 85428b6..4d8957b 100644 --- a/build/tizen/dali-application.pc.in +++ b/build/tizen/dali-application.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ apiversion=@DALI_ADAPTOR_VERSION@ -libdir=@libdir@ +libdir=${exec_prefix}/lib includedir=@devincludepath@ Name: Samsung OpenGLES Toolkit Adaptor diff --git a/build/tizen/dali.pc.in b/build/tizen/dali.pc.in index 85428b6..4d8957b 100644 --- a/build/tizen/dali.pc.in +++ b/build/tizen/dali.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ apiversion=@DALI_ADAPTOR_VERSION@ -libdir=@libdir@ +libdir=${exec_prefix}/lib includedir=@devincludepath@ Name: Samsung OpenGLES Toolkit Adaptor diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec index 6392267..078d2ba 100644 --- a/packaging/dali-adaptor-mobile.spec +++ b/packaging/dali-adaptor-mobile.spec @@ -110,7 +110,7 @@ Dynamics plugin to wrap the libBulletDynamics libraries %build PREFIX+="/usr" CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections " -LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections " +LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections " %if 0%{?sec_build_binary_debug_enable} export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" @@ -132,7 +132,7 @@ FONT_DOWNLOADED_PATH="%{font_downloaded_path}" ; export FONT_DOWNLOADED_PATH FONT_APPLICATION_PATH="%{font_application_path}" ; export FONT_APPLICATION_PATH FONT_CONFIGURATION_FILE="%{font_configuration_file}" ; export FONT_CONFIGURATION_FILE -%configure --with-jpeg-turbo --enable-gles=30 --enable-profile=%{dali_profile} --libdir=%{_libdir} +%configure --with-jpeg-turbo --enable-gles=30 --enable-profile=%{dali_profile} make %{?jobs:-j%jobs} diff --git a/packaging/dali-adaptor-wearable.spec b/packaging/dali-adaptor-wearable.spec index ee9f7ee..93c01f4 100644 --- a/packaging/dali-adaptor-wearable.spec +++ b/packaging/dali-adaptor-wearable.spec @@ -95,7 +95,7 @@ Feedback plugin to play haptic and audio feedback for Dali %build PREFIX+="/usr" CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections " -LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections " +LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections " %if 0%{?sec_build_binary_debug_enable} export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" @@ -117,7 +117,7 @@ FONT_DOWNLOADED_PATH="%{font_downloaded_path}" ; export FONT_DOWNLOADED_PATH FONT_APPLICATION_PATH="%{font_application_path}" ; export FONT_APPLICATION_PATH FONT_CONFIGURATION_FILE="%{font_configuration_file}" ; export FONT_CONFIGURATION_FILE -%configure --with-jpeg-turbo --enable-gles=30 --enable-profile=%{dali_profile} --libdir=%{_libdir} +%configure --with-jpeg-turbo --enable-gles=30 --enable-profile=%{dali_profile} make %{?jobs:-j%jobs} diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 7ac0ec3..3104472 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -113,7 +113,7 @@ Dynamics plugin to wrap the libBulletDynamics libraries %build PREFIX+="/usr" CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections " -LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections " +LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections " %if 0%{?sec_build_binary_debug_enable} export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" @@ -133,9 +133,9 @@ CXXFLAGS+=" -DWAYLAND" libtoolize --force cd %{_builddir}/%{name}-%{version}/build/tizen && autoreconf --install %if %{with wayland} -cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON --enable-wayland --libdir=%{_libdir} +cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON --enable-wayland %else -cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON --libdir=%{_libdir} +cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON %endif make %{?jobs:-j%jobs} -- 2.7.4