<div dir="ltr">[+dam directly]</div><div class="gmail_extra"><br><div class="gmail_quote">2015-03-21 20:05 GMT+00:00 Riccardo Mottola <span dir="ltr"><<a href="mailto:rmottola@opencsw.org" target="_blank">rmottola@opencsw.org</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Dago,<br>
<br>
did you with this patch finalize the removal of the special relocation of libffi.so ?<br>
I had a much easier patch but in case I throw it away for yours.<br>
<br>
Did you build & installed also the packages? I didn't see the emal for that.<span class="HOEnZb"><font color="#888888"><br>
<br>
Riccardo</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<a href="mailto:dmichelsen@users.sourceforge.net" target="_blank">dmichelsen@users.sourceforge.<u></u>net</a> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Revision: 24742<br>
<a href="http://sourceforge.net/p/gar/code/24742" target="_blank">http://sourceforge.net/p/gar/<u></u>code/24742</a><br>
Author: dmichelsen<br>
Date: 2015-03-21 19:34:49 +0000 (Sat, 21 Mar 2015)<br>
Log Message:<br>
-----------<br>
libffi/trunk: Get rid of include relocation<br>
<br>
Modified Paths:<br>
--------------<br>
csw/mgar/pkg/libffi/trunk/<u></u>Makefile<br>
<br>
Removed Paths:<br>
-------------<br>
csw/mgar/pkg/libffi/trunk/<u></u>files/0005-libffi.pc-should-<u></u>point-at-opt-csw-include.patch<br>
csw/mgar/pkg/libffi/trunk/<u></u>files/0006-Set-libdir-to-opt-<u></u>csw-lib-ffi.patch<br>
<br>
Modified: csw/mgar/pkg/libffi/trunk/<u></u>Makefile<br>
==============================<u></u>==============================<u></u>=======<br>
--- csw/mgar/pkg/libffi/trunk/<u></u>Makefile 2015-03-21 16:22:22 UTC (rev 24741)<br>
+++ csw/mgar/pkg/libffi/trunk/<u></u>Makefile 2015-03-21 19:34:49 UTC (rev 24742)<br>
@@ -39,21 +39,17 @@<br>
# found at <a href="http://software.intel.com/en-us/forums/showthread.php?t=56652" target="_blank">http://software.intel.com/en-<u></u>us/forums/showthread.php?t=<u></u>56652</a><br>
# originally for icc, but at least get the stuff to compile<br>
# PATCHFILES += ffi64.c.patch<br>
-#PATCHFILES += 0005-libffi.pc-should-point-<u></u>at-opt-csw-include.patch<br>
-#PATCHFILES += 0006-Set-libdir-to-opt-csw-<u></u>lib-ffi.patch<br>
-<br>
PACKAGES += CSWlibffi6<br>
-PKGFILES_CSWlibffi6 += $(call baseisadirs,$(libdir),libffi\.<u></u>so\.6(\.\d+)*)<br>
SPKG_DESC_CSWlibffi6 += $(DESCRIPTION), libffi.so.6<br>
-<br>
+PKGFILES_CSWlibffi6 += $(call pkgfiles_lib,libffi.so.6)<br>
RUNTIME_DEP_PKGS_CSWlibffi6 += CSWlibgcc-s1<br>
PACKAGES += CSWlibffi-dev<br>
SPKG_DESC_CSWlibffi-dev = $(DESCRIPTION) - developer package<br>
+# PKGFILES is catchall<br>
RUNTIME_DEP_PKGS_CSWlibffi-dev += CSWlibffi6<br>
-<br>
LICENSE = LICENSE<br>
BUILD64 = 1<br>
@@ -66,8 +62,7 @@<br>
CONFIGURE_ENV_PATH = $(PATH):/opt/csw/gnu<br>
# disabled because they need DejaGNU<br>
-#TEST_TARGET = check<br>
-TEST_TARGET =<br>
+SKIPTEST ?= 1<br>
include gar/<a href="http://category.mk" target="_blank">category.mk</a><br>
@@ -84,14 +79,3 @@<br>
aclocal; \<br>
automake)<br>
$(MAKECOOKIE)<br>
-<br>
-post-install-modulated:<br>
- ginstall -m 755 -d $(DESTDIR)$(libdir)<br>
- ginstall -d -m 755 $(DESTDIR)$(includedir)<br>
- # By default, libffi installer puts include files into a subdirectory under<br>
- # /opt/csw/lib, which makes the header files hard to find. We're moving<br>
- # them to /opt/csw/include.<br>
- gmv -v $(DESTDIR)$(libdir)/$(NAME)-$(<u></u>VERSION)/include/* $(DESTDIR)$(includedir)<br>
- rmdir $(DESTDIR)$(libdir)/$(NAME)-$(<u></u>VERSION)/include<br>
- rmdir $(DESTDIR)$(libdir)/$(NAME)-$(<u></u>VERSION)<br>
- @$(MAKECOOKIE)<br>
<br>
Deleted: csw/mgar/pkg/libffi/trunk/<u></u>files/0005-libffi.pc-should-<u></u>point-at-opt-csw-include.patch<br>
==============================<u></u>==============================<u></u>=======<br>
--- csw/mgar/pkg/libffi/trunk/<u></u>files/0005-libffi.pc-should-<u></u>point-at-opt-csw-include.patch 2015-03-21 16:22:22 UTC (rev 24741)<br>
+++ csw/mgar/pkg/libffi/trunk/<u></u>files/0005-libffi.pc-should-<u></u>point-at-opt-csw-include.patch 2015-03-21 19:34:49 UTC (rev 24742)<br>
@@ -1,25 +0,0 @@<br>
-From f67593e5e96dfc0becb3dc3a2272f4<u></u>b3cabc4e13 Mon Sep 17 00:00:00 2001<br>
-From: Maciej Blizinski <<a href="mailto:maciej@opencsw.org" target="_blank">maciej@opencsw.org</a>><br>
-Date: Mon, 14 Mar 2011 08:07:09 +0100<br>
-Subject: [PATCH] libffi.pc should point at /opt/csw/include<br>
-<br>
----<br>
- <a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a> | 2 +-<br>
- 1 files changed, 1 insertions(+), 1 deletions(-)<br>
-<br>
-diff --git a/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a> b/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-index c2e1c7b..5f0e9db 100644<br>
---- a/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-+++ b/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-@@ -1,7 +1,7 @@<br>
- prefix=@prefix@<br>
- exec_prefix=@exec_prefix@<br>
- libdir=@libdir@<br>
--includedir=${libdir}/@<u></u>PACKAGE_NAME@-@PACKAGE_<u></u>VERSION@/include<br>
-+includedir=${prefix}/include<br>
-<br>
- Name: @PACKAGE_NAME@<br>
- Description: Library supporting Foreign Function Interfaces<br>
---<br>
-1.7.3.2<br>
-<br>
<br>
Deleted: csw/mgar/pkg/libffi/trunk/<u></u>files/0006-Set-libdir-to-opt-<u></u>csw-lib-ffi.patch<br>
==============================<u></u>==============================<u></u>=======<br>
--- csw/mgar/pkg/libffi/trunk/<u></u>files/0006-Set-libdir-to-opt-<u></u>csw-lib-ffi.patch 2015-03-21 16:22:22 UTC (rev 24741)<br>
+++ csw/mgar/pkg/libffi/trunk/<u></u>files/0006-Set-libdir-to-opt-<u></u>csw-lib-ffi.patch 2015-03-21 19:34:49 UTC (rev 24742)<br>
@@ -1,23 +0,0 @@<br>
-From 003977c00c9523f4a3a913b40b1460<u></u>eb718b5d0e Mon Sep 17 00:00:00 2001<br>
-From: Maciej Blizinski <<a href="mailto:maciej@opencsw.org" target="_blank">maciej@opencsw.org</a>><br>
-Date: Sat, 25 Jun 2011 19:18:48 +0200<br>
-Subject: [PATCH] Set libdir to /opt/csw/lib/ffi.<br>
-<br>
----<br>
- <a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a> | 2 +-<br>
- 1 files changed, 1 insertions(+), 1 deletions(-)<br>
-<br>
-diff --git a/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a> b/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-index 692296d..88391dc 100644<br>
---- a/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-+++ b/<a href="http://libffi.pc.in" target="_blank">libffi.pc.in</a><br>
-@@ -6,5 +6,5 @@ includedir=${prefix}/include<br>
- Name: @PACKAGE_NAME@<br>
- Description: Library supporting Foreign Function Interfaces<br>
- Version: @PACKAGE_VERSION@<br>
--Libs: -L${libdir} -lffi<br>
-+Libs: -L${libdir}/ffi -lffi<br>
- Cflags: -I${includedir}<br>
---<br>
-1.7.5.4<br>
-<br>
<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.<br>
<br>
</blockquote>
<br>
</div></div></blockquote></div><br></div>