commit 7d826570f2d5cefa403eff3d45b121a360473d0e
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Dec 4 21:05:35 2017 +0100
- updated to 2.0 (note: new sonames)
- updated make-jN patch
ffcall-make-jN.patch | 27 ++++++++++++++++++++-------
ffcall.spec | 17 +++++++++++------
2 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/ffcall.spec b/ffcall.spec
index a7e45c7..27317c6 100644
--- a/ffcall.spec
+++ b/ffcall.spec
@@ -1,13 +1,13 @@
Summary: Libraries for building foreign function call interfaces
Summary(pl.UTF-8): Biblioteki do tworzenia interfejsów wywołań obcych
funkcji
Name: ffcall
-Version: 1.13
+Version: 2.0
Release: 1
Epoch: 1
License: GPL v2+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/libffcall/libffcall-%{version}.tar.gz
-# Source0-md5: cb3051a80726b5e7b9031c4038a56afc
+# Source0-md5: e2e67382752287c5a7c42ac7ae79bfdc
Patch0: %{name}-make-jN.patch
URL: http://savannah.gnu.org/projects/libffcall
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,7 +82,6 @@ Statyczne wersje bibliotek avcall i callback.
%install
rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{_mandir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -100,24 +99,29 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog NEWS PLATFORMS README
%attr(755,root,root) %{_libdir}/libavcall.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcall.so.0
+%attr(755,root,root) %ghost %{_libdir}/libavcall.so.1
%attr(755,root,root) %{_libdir}/libcallback.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcallback.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcallback.so.1
+%attr(755,root,root) %{_libdir}/libffcall.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libffcall.so.0
%attr(755,root,root) %{_libdir}/libtrampoline.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtrampoline.so.0
+%attr(755,root,root) %ghost %{_libdir}/libtrampoline.so.1
%files devel
%defattr(644,root,root,755)
%doc */*.html
%attr(755,root,root) %{_libdir}/libavcall.so
%attr(755,root,root) %{_libdir}/libcallback.so
+%attr(755,root,root) %{_libdir}/libffcall.so
%attr(755,root,root) %{_libdir}/libtrampoline.so
%{_libdir}/libavcall.la
%{_libdir}/libcallback.la
+%{_libdir}/libffcall.la
%{_libdir}/libtrampoline.la
%{_libdir}/libvacall.a
%{_includedir}/avcall.h
%{_includedir}/callback.h
+%{_includedir}/ffcall-*.h
%{_includedir}/trampoline*.h
%{_includedir}/vacall*.h
%{_mandir}/man3/avcall.3*
@@ -129,4 +133,5 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libavcall.a
%{_libdir}/libcallback.a
+%{_libdir}/libffcall.a
%{_libdir}/libtrampoline.a
diff --git a/ffcall-make-jN.patch b/ffcall-make-jN.patch
index d08c896..5fadadd 100644
--- a/ffcall-make-jN.patch
+++ b/ffcall-make-jN.patch
@@ -1,13 +1,26 @@
---- ffcall-1.10/callback/Makefile.in~ 2003-10-01 21:46:19.000000000 +0200
-+++ ffcall-1.10/callback/Makefile.in 2007-12-18 21:10:51.302118000 +0100
-@@ -51,6 +51,10 @@
- all-subdirs : force
- cd @subdir@; $(MAKE) all
+--- libffcall-2.0/callback/Makefile.in.orig 2017-09-10 13:48:38.000000000
+0200
++++ libffcall-2.0/callback/Makefile.in 2017-12-04 19:00:05.515956833 +0100
+@@ -76,6 +76,10 @@
+ callback-compat.lo : $(srcdir)/callback-compat.c ../config.h
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c
$(srcdir)/callback-compat.c
+vacall_r/libvacall.la: all-subdirs
+
+trampoline_r/libtrampoline.la: all-subdirs
+
- callback.h :
- $(LN_S) $(srcdir)/callback.h.in callback.h
+ libcallback.la : vacall_r/libvacall.la trampoline_r/libtrampoline.la
callback-libapi.lo callback-compat.lo
+ $(LIBTOOL_LINK) $(CC) -o libcallback.la -rpath $(libdir) -no-undefined
-export-symbols-regex $(LIBCALLBACK_EXPORTED_SYMBOLS_REGEX) -version-info
$(LIBCALLBACK_VERSION_INFO) vacall_r/vacall.lo vacall_r/vacall-libapi.lo
vacall_r/vacall-structcpy.lo trampoline_r/*.lo callback-libapi.lo
callback-compat.lo ../gnulib-lib/libgnu.la $(LDFLAGS) $(LTLIBTHREAD)
+
+--- libffcall-2.0/Makefile.in.orig 2017-09-10 13:49:17.000000000 +0200
++++ libffcall-2.0/Makefile.in 2017-12-04 20:16:10.922571372 +0100
+@@ -65,6 +65,10 @@
+ ffcall-version.lo : $(srcdir)/ffcall-version.c ffcall-version.h config.h
+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c
$(srcdir)/ffcall-version.c
+
++avcall/avcall.lo avcall/avcall-libapi.lo avcall/avcall-structcpy.lo:
all-subdirs
++
++callback/vacall_r/libvacall.la callback/trampoline_r/libtrampoline.la
callback/callback-libapi.lo: all-subdirs
++
+ libffcall.la : ffcall-version.lo avcall/avcall.lo avcall/avcall-libapi.lo
avcall/avcall-structcpy.lo callback/vacall_r/libvacall.la
callback/trampoline_r/libtrampoline.la callback/callback-libapi.lo
+ $(LIBTOOL_LINK) $(CC) -o libffcall.la -rpath $(libdir) -no-undefined
-export-symbols-regex $(LIBFFCALL_EXPORTED_SYMBOLS_REGEX) -version-info
$(LIBFFCALL_VERSION_INFO) ffcall-version.lo avcall/avcall.lo
avcall/avcall-libapi.lo avcall/avcall-structcpy.lo callback/vacall_r/vacall.lo
callback/vacall_r/vacall-libapi.lo callback/vacall_r/vacall-structcpy.lo
callback/trampoline_r/*.lo callback/callback-libapi.lo gnulib-lib/libgnu.la
$(LDFLAGS) $(LTLIBTHREAD)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffcall.git/commitdiff/7d826570f2d5cefa403eff3d45b121a360473d0e
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
