From 3824c1fec1ba14ec876157caba691be8bd3f9b14 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Tue, 4 Feb 2020 09:50:13 +0900 Subject: [PATCH] Fix build error due to giflib build changes - Autoconf was removed and replaced to Makefile with script - Changes build for tizen 1. change in Makefile The static library(.a) was commented out. 2. change in spec make libgif.so libutil.so : build libraries install install-lib install-include install-bin : install library, header and utility tools install and rename libutil.so to libgifutil.so due to confict name with glib.c : The libutil.so was added for deprecated function 'GifQuantizeBuffer'. It will be removed since giflib 5.2.0. Change-Id: Iab75711144a50fbaec4ce15cfb6e9c3f74b7a59d --- Makefile | 2 +- packaging/giflib.spec | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index e4ded69..beb93f4 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ install-include: $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" install-lib: $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +# $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" diff --git a/packaging/giflib.spec b/packaging/giflib.spec index 3dc2792..b320d2d 100644 --- a/packaging/giflib.spec +++ b/packaging/giflib.spec @@ -40,6 +40,7 @@ You should install this package if you need to develop programs which will use giflib library functions. You'll also need to install the giflib package. +# It is necessary to check if this package is needed. %package utils Summary: Programs for manipulating GIF format image files Group: Applications/Multimedia @@ -57,23 +58,17 @@ You'll also need to install the giflib package. cp %{SOURCE1001} . %build -%configure \ -%if %{with wayland} && !%{with x} - --disable-x11 -%endif - -make %{?_smp_mflags} all - -MAJOR=`echo '%{version}' | sed 's/\([0-9]\+\)\..*/\1/'` -gcc %{optflags} -shared -Wl,-soname,libungif.so.$MAJOR -Llib/.libs -lgif -o libungif.so.%{version} +make libgif.so libutil.so DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr %install -%make_install +make install-lib install-include install-bin DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr -install -m 0755 -p libungif.so.%{version} %{buildroot}%{_libdir} -ln -sf libungif.so.%{version} %{buildroot}%{_libdir}/libungif.so.4 -ln -sf libungif.so.4 %{buildroot}%{_libdir}/libungif.so +install -m 0755 -p libutil.so %{buildroot}%{_libdir}/libgifutil.so.7.1.0 +ln -sf libgifutil.so.7.1.0 %{buildroot}%{_libdir}/libgifutil.so.7 +ln -sf libgifutil.so.7 %{buildroot}%{_libdir}/libgifutil.so +%clean +make clean %post -p /sbin/ldconfig -- 2.7.4