From: Sangwon Ha Date: Tue, 21 Jul 2015 14:38:07 +0000 (+0900) Subject: Fix build failure in dependent packages X-Git-Tag: submit/tizen_tv/20151202.065316~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=459733dfb5fc4a24351598e405ec624c9a061c67;p=platform%2Fcore%2Fuifw%2Flibgbm.git Fix build failure in dependent packages - Before, package supplied incorrect Provides field - Change .so filename to reflect un-versioned .so Change-Id: I590b2019b85dcae3f514010d5f58700e302a2b02 --- diff --git a/Makefile b/Makefile index 7caa560..f5ec405 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ -GBM_SO_VER ?= no_ver SRC_DIR = ./src #CROSS_COMPILE ?= arm-none-linux-gnueabi- @@ -23,7 +22,7 @@ GBM_SRCS += \ GBM_OBJS := $(GBM_SRCS:.c=.o) -libgbm.so.$(GBM_SO_VER): $(GBM_OBJS) +libgbm.so: $(GBM_OBJS) $(TARGET_CC) -shared -o $@ $(GBM_OBJS) $(CFLAGS) backend: @for dir in $(GBM_BACKENDS_DIR) ; do \ @@ -31,10 +30,10 @@ backend: done .DEFAULT_GOAL = all -all: libgbm.so.$(GBM_SO_VER) backend +all: libgbm.so backend clean: - -rm -f $(GBM_OBJS) libgbm.so.$(GBM_SO_VER) + -rm -f $(GBM_OBJS) libgbm.so @for dir in $(GBM_BACKENDS_DIR) ; do \ $(MAKE) $@ -C $$dir ; \ done @@ -47,7 +46,7 @@ install: all cp $(SRC_DIR)/common.h $(includedir)/gbm/ cp $(SRC_DIR)/gbmint.h $(includedir)/gbm/ cp pkgconfig/gbm.pc $(libdir)/pkgconfig/ - cp libgbm.so.$(GBM_SO_VER) $(libdir)/ + cp libgbm.so $(libdir)/ @for dir in $(GBM_BACKENDS_DIR) ; do \ $(MAKE) $@ -C $$dir ; \ done @@ -59,7 +58,7 @@ uninstall: -rm -f $(includedir)/gbm/common.h -rm -f $(includedir)/gbm/gbmint.h -rm -f $(libdir)/pkgconfig/gbm.pc - -rm -f $(libdir)/libgbm.so.$(GBM_SO_VER) + -rm -f $(libdir)/libgbm.so @for dir in $(GBM_BACKENDS_DIR) ; do \ $(MAKE) $@ -C $$dir ; \ done diff --git a/packaging/libgbm.spec b/packaging/libgbm.spec index 767e3fa..7d285cf 100644 --- a/packaging/libgbm.spec +++ b/packaging/libgbm.spec @@ -14,8 +14,6 @@ BuildRequires: systemd-devel BuildRequires: pkgconfig(libudev) BuildRequires: libdrm-devel -Provides: libgbm.so - %description Wayland Generic Buffer Management for TIZEN @@ -31,18 +29,13 @@ Development header files for use with Wayland GBM %setup -q -n %{name} %build -export GBM_SO_VER=%{version} make clean make libdir=%{_libdir} %install mkdir -p %{buildroot}%{_includedir} mkdir -p %{buildroot}%{_libdir}/pkgconfig -ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so -ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so.1 -ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so.1.0 -export GBM_SO_VER=%{version} %makeinstall %post -p /sbin/ldconfig @@ -53,9 +46,6 @@ export GBM_SO_VER=%{version} %manifest packaging/libgbm.manifest %defattr(-,root,root,-) %{_libdir}/libgbm.so -%{_libdir}/libgbm.so.1 -%{_libdir}/libgbm.so.1.0 -%{_libdir}/libgbm.so.%{version} %files devel %defattr(-,root,root,-)